nyastodon/app/controllers/auth
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +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 Merge branch 'main' into glitch-soc/merge-upstream 2022-05-26 22:49:47 +02:00
omniauth_callbacks_controller.rb Allow login through OpenID Connect (#16221) 2022-03-09 12:07:35 +01: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-03-02 18:02:48 +01:00
sessions_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
setup_controller.rb Fix new user confirmation page styling 2019-10-01 13:48:47 +02:00