You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		1 year ago
..
account_batch.rb	Fix reports not being closed when performing batch suspensions (#24988)	2 years ago
admin_settings.rb	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream	1 year ago
challenge.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
custom_emoji_batch.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
delete_confirmation.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
domain_block_batch.rb	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2 years ago
email_domain_block_batch.rb	Change e-mail domain blocks to block IPs dynamically (#17635)	3 years ago
import.rb	Rewrite import feature (#21054)	2 years ago
ip_block_batch.rb	Add IP-based rules (#14963)	4 years ago
redirect.rb	Fix 500 error when trying to migrate to an invalid address (#21462)	2 years ago
status_filter_batch_action.rb	Add ability to filter individual posts (#18945)	2 years ago
two_factor_confirmation.rb	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	5 years ago