Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		2018-12-15 10:45:53 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
features	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
fixtures	Error message for avatar image that's too large. #9204 (#9518)	2018-12-14 05:07:21 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
lib	Add specs for list replies policy	2018-11-28 14:46:07 +01:00
mailers	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
policies	Add test to disallow remote users from fetching local-only toots	2018-07-31 15:41:04 +02:00
presenters	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +01:00
requests	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
support	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
workers	Lists (#5703)	2017-11-18 00:16:48 +01:00
rails_helper.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
spec_helper.rb	Disable simplecov on CircleCI (#7416)	2018-05-09 16:59:58 +02:00