Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 24 Oct 2019 07:42:14 +0000 (14:42 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 24 Oct 2019 07:55:36 +0000 (14:55 +0700)
commit4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c
treef296a9b23362e59daf1eac6b669886be8dab1576
parent478f0883eb994c639923b7b27259a02bcef8708c
parent17c237ba808d4356bb1e202e459680563b79ef99
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
22 files changed:
lib/mix/tasks/pleroma/user.ex
lib/pleroma/user.ex
lib/pleroma/user/query.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/activity_pub/relay.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/visibility.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
test/support/factory.ex
test/tasks/database_test.exs
test/tasks/user_test.exs
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/relay_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs
test/web/mastodon_api/controllers/follow_request_controller_test.exs
test/web/streamer/streamer_test.exs
test/web/twitter_api/util_controller_test.exs