Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +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	Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (#24073)	2023-03-13 00:06:27 +01: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 '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
sessions_controller.rb	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
setup_controller.rb	[Glitch] Add polling and automatic redirection to `/start` on email confirmation	2023-05-25 22:37:14 +02:00