Claire 702d162998 Merge commit '5393be7a21' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/registrations_controller.rb`: Not a real conflict. Upstream removed the `set_instance_presenter` private method from this class, and glitch-soc has an extra private method right besides it for the theming system. Removed `set_instance_presenter` as upstream did. - `app/controllers/auth/sessions_controller.rb`: Not a real conflict. Upstream removed the `set_instance_presenter` private method from this class, and glitch-soc has an extra private method right besides it for the theming system. Removed `set_instance_presenter` as upstream did.		2023-10-08 16:48:19 +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	Add users index on unconfirmed_email (#25672)	2023-07-02 19:41:35 +02:00
omniauth_callbacks_controller.rb	Coverage for Auth::OmniauthCallbacks controller (#26147)	2023-07-25 09:46:57 +02:00
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
registrations_controller.rb	Merge commit '5393be7a21' into glitch-soc/merge-upstream	2023-10-08 16:48:19 +02:00
sessions_controller.rb	Merge commit '5393be7a21' into glitch-soc/merge-upstream	2023-10-08 16:48:19 +02:00
setup_controller.rb	[Glitch] Add polling and automatic redirection to /start on email confirmation	2023-05-25 22:37:14 +02:00