Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ...

# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs

2019-11-21 16:47:52 +03:00

..

controllers

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

2019-11-21 16:47:52 +03:00

views

[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.

2019-11-20 15:46:11 +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