Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.

2023-04-22 10:06:11 +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

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +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 branch 'main' into glitch-soc/merge-upstream

2023-04-01 14:31:05 +02:00

sessions_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

setup_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-22 10:06:11 +02:00