1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-25 09:35:40 +01:00
pleroma/test/web/mastodon_api
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
..
controllers Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
views Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
mastodon_api_controller_test.exs Move :favourites and :bookmarks actions to StatusController 2019-10-02 21:31:19 +07:00
mastodon_api_test.exs [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00