mastodon/app/views/admin/settings
Claire 9e224add8a Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.

Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file.
2023-05-25 22:49:18 +02:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
appearance Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
branding Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
content_retention Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
discovery Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
other Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
registrations Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream 2023-05-25 22:49:18 +02:00
shared Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00