Thibaut Girka de5cc20dd8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it.		2020-11-14 00:30:36 +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 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
omniauth_callbacks_controller.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
passwords_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
registrations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-14 00:30:36 +01:00
setup_controller.rb	Fix new user confirmation page styling	2019-10-01 13:48:47 +02:00