Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2023-05-08 15:28:36 +02:00
..
exports
migration
preferences
two_factor_authentication	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
aliases_controller.rb
applications_controller.rb	Fix Rails/ActionOrder cop (#24692)	2023-04-30 06:46:39 +02:00
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
imports_controller.rb
login_activities_controller.rb
migrations_controller.rb
pictures_controller.rb
preferences_controller.rb	Change user settings to be stored in a more optimal way (#23630)	2023-03-30 14:44:00 +02:00
profiles_controller.rb
sessions_controller.rb
two_factor_authentication_methods_controller.rb