You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire f15ded319f 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.		2 years ago
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
omniauth_callbacks_controller.rb	Fix crash when external auth provider has no display_name set (#19962)	2 years ago
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
setup_controller.rb	Fix new user confirmation page styling	5 years ago