ad1098970b
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. |
||
|---|---|---|
| .. | ||
| account_actions | ||
| account_warnings | ||
| accounts | ||
| action_logs | ||
| announcements | ||
| change_emails | ||
| custom_emojis | ||
| dashboard | ||
| disputes/appeals | ||
| domain_allows | ||
| domain_blocks | ||
| email_domain_blocks | ||
| export_domain_allows | ||
| export_domain_blocks | ||
| follow_recommendations | ||
| instances | ||
| invites | ||
| ip_blocks | ||
| relationships | ||
| relays | ||
| report_notes | ||
| reports | ||
| roles | ||
| rules | ||
| settings | ||
| status_edits | ||
| statuses | ||
| tags | ||
| trends | ||
| users/roles | ||
| warning_presets | ||
| webhooks | ||