hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into notice-routes

Browse source
This commit is contained in:
Alex Gleason 2021-12-25 19:57:53 -06:00
commit db2bf55e9b
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
4319 changed files with 9915 additions and 14432 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/pleroma/web/o_status/o_status_controller_test.exs
View file

@ -182,7 +182,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
|> response(200)
assert resp =~
"<meta content=\"#{Pleroma.Web.base_url()}/notice/#{note_activity.id}\" property=\"og:url\">"
"<meta content=\"#{Pleroma.Web.Endpoint.url()}/notice/#{note_activity.id}\" property=\"og:url\">"
user = insert(:user)