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 175446f293 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		3 years ago
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Change CAPTCHA handling to be only on email verification	3 years ago
omniauth_callbacks_controller.rb	Fix undefined variable for Auth::OmniauthCallbacksController (#16654)	3 years ago
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
setup_controller.rb	Fix new user confirmation page styling	5 years ago