Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs		2020-05-13 12:42:36 +03:00
..
account_controller	Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema	2020-04-27 20:46:52 +04:00
account_controller_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
app_controller_test.exs	Support validation for inline OpenAPI schema and automatic tests for examples	2020-04-24 15:16:15 +04:00
auth_controller_test.exs
conversation_controller_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
custom_emoji_controller_test.exs	Move single used schemas to operation schema	2020-04-27 22:55:05 +04:00
domain_block_controller_test.exs	Support validation for inline OpenAPI schema and automatic tests for examples	2020-04-24 15:16:15 +04:00
filter_controller_test.exs	Move single used schemas to Filter operation schema	2020-05-05 17:41:01 +04:00
follow_request_controller_test.exs	Add OpenAPI spec for FollowRequestController	2020-05-05 17:40:00 +04:00
instance_controller_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
list_controller_test.exs	Add OpenAPI spec for ListController	2020-05-05 17:05:34 +04:00
marker_controller_test.exs	Merge branch 'develop' into issue/1276-2	2020-05-06 14:47:50 +03:00
media_controller_test.exs
notification_controller_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
poll_controller_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
report_controller_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
scheduled_activity_controller_test.exs	Add OpenAPI spec for ScheduledActivityController	2020-05-05 23:42:24 +04:00
search_controller_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
status_controller_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
subscription_controller_test.exs	Add OpenAPI spec for SubscriptionController	2020-05-05 16:43:00 +04:00
suggestion_controller_test.exs	Fix sporadic test compilation failure caused by unused alias	2020-05-01 22:50:40 +03:00
timeline_controller_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00