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 b0781a933d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		3 years ago
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Change CAPTCHA handling to be only on email verification	3 years ago
omniauth_callbacks_controller.rb	Allow login through OpenID Connect (#16221)	3 years ago
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
setup_controller.rb	Fix new user confirmation page styling	5 years ago