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 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' 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.		1 year ago
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Add users index on unconfirmed_email (#25672)	1 year ago
omniauth_callbacks_controller.rb	Coverage for `Auth::OmniauthCallbacks` controller (#26147)	1 year ago
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
registrations_controller.rb	Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream	1 year ago
sessions_controller.rb	Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream	1 year ago
setup_controller.rb	[Glitch] Add polling and automatic redirection to `/start` on email confirmation	1 year ago