mastodon/app/controllers/settings
Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
..
exports
migration
preferences
two_factor_authentication
aliases_controller.rb
applications_controller.rb
base_controller.rb
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb
imports_controller.rb
login_activities_controller.rb
migrations_controller.rb
pictures_controller.rb
privacy_controller.rb
profiles_controller.rb
sessions_controller.rb
two_factor_authentication_methods_controller.rb
verifications_controller.rb