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 7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' 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.		1 year ago
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year ago
omniauth_callbacks_controller.rb	Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (#24073)	2 years ago
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
registrations_controller.rb	Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream	1 year ago
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
setup_controller.rb	[Glitch] Add polling and automatic redirection to `/start` on email confirmation	1 year ago