You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec/controllers/settings
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.
7 years ago
..
exports
two_factor_authentication Lint pass (#8876) 8 years ago
applications_controller_spec.rb lint pass 2 (#8878) 8 years ago
deletes_controller_spec.rb
exports_controller_spec.rb Add spec for Settings::ExportsController#create (#9512) 7 years ago
flavours_controller_spec.rb
follower_domains_controller_spec.rb
imports_controller_spec.rb
migrations_controller_spec.rb Lint pass (#8876) 8 years ago
notifications_controller_spec.rb
preferences_controller_spec.rb Change language opt-out to language opt-in (#7823) 8 years ago
profiles_controller_spec.rb Error message for avatar image that's too large. #9204 (#9518) 7 years ago
sessions_controller_spec.rb Add missing tests for sessions controller (#7744) 8 years ago
two_factor_authentications_controller_spec.rb