Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
account_batch.rb	Fix Sidekiq warnings about JSON serialization (#17381)	2022-01-28 00:43:56 +01:00
admin_settings.rb	Change CAPTCHA handling to be only on email verification	2022-01-25 23:56:57 +01:00
challenge.rb
custom_emoji_batch.rb
delete_confirmation.rb
email_domain_block_batch.rb	Change e-mail domain blocks to block IPs dynamically (#17635)	2022-02-24 17:28:23 +01:00
ip_block_batch.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
redirect.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00
two_factor_confirmation.rb