Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.		2022-01-23 18:24:01 +01: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 branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
omniauth_callbacks_controller.rb	Fix undefined variable for Auth::OmniauthCallbacksController (#16654)	2021-08-25 17:40:56 +02:00
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-06 00:15:38 +01:00
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +01:00
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +01:00
setup_controller.rb	Fix new user confirmation page styling	2019-10-01 13:48:47 +02:00