mastodon/spec/controllers/settings
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
..
exports
migration
preferences
two_factor_authentication
aliases_controller_spec.rb
applications_controller_spec.rb
deletes_controller_spec.rb
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb
imports_controller_spec.rb
login_activities_controller_spec.rb
migrations_controller_spec.rb
pictures_controller_spec.rb
privacy_controller_spec.rb
profiles_controller_spec.rb
sessions_controller_spec.rb
two_factor_authentication_methods_controller_spec.rb
verifications_controller_spec.rb