Thibaut Girka 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.		2019-04-04 14:53:52 +02:00
..
exports	Export and import hide_notifications alongside user mutes (#10335)	2019-04-03 18:17:43 +02:00
two_factor_authentication	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
applications_controller_spec.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
deletes_controller_spec.rb
exports_controller_spec.rb	Add spec for Settings::ExportsController#create (#9512)	2018-12-13 02:53:52 +01:00
flavours_controller_spec.rb
identity_proofs_controller_spec.rb	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
imports_controller_spec.rb
migrations_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
notifications_controller_spec.rb
preferences_controller_spec.rb	Change language opt-out to language opt-in (#7823)	2018-06-17 13:54:02 +02:00
profiles_controller_spec.rb	Error message for avatar image that's too large. #9204 (#9518)	2018-12-14 05:07:21 +01:00
sessions_controller_spec.rb	Add missing tests for sessions controller (#7744)	2018-06-06 10:23:22 +09:00
two_factor_authentications_controller_spec.rb