mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-01 00:59:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/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 Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
base_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
deletes_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
exports_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
flavours_controller.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
follower_domains_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
imports_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
migrations_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
notifications_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
preferences_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
profiles_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
two_factor_authentications_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00