Claire b368c75029 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.		2022-04-06 21:10:23 +02:00
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	2019-09-30 13:37:13 +02:00
confirmations_controller.rb	Change CAPTCHA handling to be only on email verification	2022-01-25 23:56:57 +01:00
omniauth_callbacks_controller.rb	Allow login through OpenID Connect (#16221)	2022-03-09 12:07:35 +01:00
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-06 00:15:38 +01:00
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
setup_controller.rb	Fix new user confirmation page styling	2019-10-01 13:48:47 +02:00