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/app/controllers/settings
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
8 years ago
..
exports Remove exports/base controller in favor of shared concern (#3444) 9 years ago
two_factor_authentication Merge remote-tracking branch 'origin/master' into merge-upstream 8 years ago
applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
base_controller.rb Finalized theme loading and stuff 8 years ago
deletes_controller.rb Prepend check_enabled_deletion to Settings::DeletesController (#229) 8 years ago
exports_controller.rb Fix data export page error 8 years ago
flavours_controller.rb Thank you, Officer Murphy 8 years ago
follower_domains_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
imports_controller.rb Finalized theme loading and stuff 8 years ago
migrations_controller.rb Fix migration page style 8 years ago
notifications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
preferences_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
profiles_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
sessions_controller.rb Finalized theme loading and stuff 8 years ago
two_factor_authentications_controller.rb Finalized theme loading and stuff 8 years ago