Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
challenges_controller.rb	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream	2023-10-24 19:31:14 +02:00
confirmations_controller.rb	Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream	2024-01-27 19:06:41 +01:00
omniauth_callbacks_controller.rb	Fix user creation failure handling in OAuth paths (#29207)	2024-02-14 23:12:59 +01:00
passwords_controller.rb	Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream	2024-01-27 19:06:41 +01:00
registrations_controller.rb	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
sessions_controller.rb	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
setup_controller.rb	[Glitch] Add polling and automatic redirection to `/start` on email confirmation	2023-05-25 22:37:14 +02:00