Ivan Tashkinov 226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks ... # Conflicts: # test/web/admin_api/admin_api_controller_test.exs		2020-02-18 17:52:31 +03:00
..
controllers	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
views	MastodonAPI.StatusView: Do not use site_name	2020-02-15 00:36:09 +01:00
mastodon_api_controller_test.exs	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +03: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