Merge branch 'develop' into global-status-expiration

2020-04-20 20:37:56 +04:00 · 2020-04-20 20:37:56 +04:00 · 364eecc49f
commit 364eecc49f
parent dc8fa04192 28165dad3a
150 changed files with 2240 additions and 1402 deletions
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@ -180,7 +180,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
      {:ok, user} = ActivityPub.make_user_from_ap_id(user_id)
      assert user.ap_id == user_id
      assert user.nickname == "admin@mastodon.example.org"
-      assert user.source_data
      assert user.ap_enabled
      assert user.follower_address == "http://mastodon.example.org/users/admin/followers"
    end