Claire ad1098970b Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' 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
..
account_batch.rb	Fix reports not being closed when performing batch suspensions (#24988)	2023-05-16 14:56:49 +02:00
admin_settings.rb	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
challenge.rb
custom_emoji_batch.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
delete_confirmation.rb
domain_block_batch.rb
email_domain_block_batch.rb
import.rb	Rewrite import feature (#21054)	2023-05-02 12:08:48 +02:00
ip_block_batch.rb
redirect.rb
status_filter_batch_action.rb
two_factor_confirmation.rb