tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream

Browse Source 
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.
This commit is contained in:
Claire
2023-05-25 22:49:18 +02:00
parent ba73f0ea3a bec6a1cad4
commit ad1098970b
6 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/settings.yml
View File

@@ -43,8 +43,8 @@ defaults: &defaults
show_domain_blocks_rationale: 'disabled'
outgoing_spoilers: ''
require_invite_text: false
captcha_enabled: false
backups_retention_period: 7
captcha_enabled: false
development:
<<: *defaults