Claire 6c99479ef4 Merge commit '9e245d147b' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.		2023-06-18 13:41:33 +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	Merge commit '9e245d147b' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +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 '4a22e72b9b' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
setup_controller.rb	[Glitch] Add polling and automatic redirection to /start on email confirmation	2023-05-25 22:37:14 +02:00