honkoma/test/web
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
..
activity_pub Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
admin_api Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
api_spec
auth Upgrade Comeonin to v5 2020-05-12 17:14:59 -05:00
common_api Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
feed Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
instances
mastodon_api Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-13 12:42:36 +03:00
media_proxy
metadata Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
mongooseim Upgrade Comeonin to v5 2020-05-12 17:14:59 -05:00
oauth Upgrade Comeonin to v5 2020-05-12 17:14:59 -05:00
ostatus
pleroma_api/controllers Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
plugs
push Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
rich_media Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
static_fe Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
streamer Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
twitter_api Upgrade Comeonin to v5 2020-05-12 17:14:59 -05:00
views
web_finger WebFinger Test: Add back test. 2020-05-05 09:55:33 +02:00
chat_channel_test.exs
fallback_test.exs
federator_test.exs Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs