Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		2023-02-25 14:00:40 +01:00
..
exports
migration
preferences
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
aliases_controller.rb
applications_controller.rb	Change POST /settings/applications/:id to regenerate token on scopes change (#23359)	2023-02-02 12:03:49 +01:00
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-16 08:30:00 +01:00
deletes_controller.rb	Remove setting that disables account deletes (#17683)	2022-10-06 10:16:47 +02:00
exports_controller.rb
featured_tags_controller.rb	Change featured hashtag deletion to be done synchronously (#19590)	2022-10-31 16:31:44 +01:00
flavours_controller.rb
imports_controller.rb
login_activities_controller.rb
migrations_controller.rb
pictures_controller.rb
preferences_controller.rb
profiles_controller.rb
sessions_controller.rb
two_factor_authentication_methods_controller.rb