djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/spec/controllers/settings
History
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
..
exports Remove exports/base controller in favor of shared concern (#3444) 2017-05-30 19:06:01 +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 Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
exports_controller_spec.rb Add spec for Settings::ExportsController#create (#9512) 2018-12-13 02:53:52 +01:00
flavours_controller_spec.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
follower_domains_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
imports_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
migrations_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
notifications_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
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 Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00