Claire f55959ebd9 Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		2023-07-30 14:58:56 +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 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
sessions_controller.rb	Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +02:00
setup_controller.rb	[Glitch] Add polling and automatic redirection to `/start` on email confirmation	2023-05-25 22:37:14 +02:00