Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex		2020-10-17 13:12:39 +03:00
..
builders	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
captcha	tests consistency	2020-10-13 16:35:09 +03:00
api_spec_helpers.ex	Add OpenAPI spec for PleromaAPI.PleromaAPIController	2020-05-20 15:15:13 +04:00
channel_case.ex	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
cluster.ex	Re-enable the federated tests, increase timeout	2020-07-09 13:49:30 -04:00
conn_case.ex	[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.	2020-10-02 22:18:02 +03:00
data_case.ex	[#2074] OAuth scope checking in Streaming API.	2020-09-19 19:16:55 +03:00
factory.ex	Change user.discoverable field to user.is_discoverable	2020-10-13 09:45:08 -05:00
helpers.ex	Update clear_config macro	2020-08-05 17:46:14 +03:00
http_request_mock.ex	RichMedia: Do a HEAD request to check content type/length	2020-09-14 14:45:58 +03:00
mrf_module_mock.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
oban_helpers.ex	migrate to oban 2.0-rc1	2020-06-23 15:09:01 +03:00
websocket_client.ex	Older copyright updates	2020-03-03 16:46:45 -06:00