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
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	2019-09-30 13:37:13 +02:00
confirmations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 22:49:47 +02:00
omniauth_callbacks_controller.rb	Fix crash when external auth provider has no display_name set (#19962)	2022-11-07 15:43:24 +01:00
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
setup_controller.rb	Fix new user confirmation page styling	2019-10-01 13:48:47 +02:00