Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
account_batch.rb	Add remove from followers api (#16864)	2021-10-18 12:02:35 +02:00
admin_settings.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
challenge.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
custom_emoji_batch.rb	Cache result of SQL (#14534)	2020-08-09 15:23:42 +02:00
delete_confirmation.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	2019-09-15 21:08:39 +02:00
ip_block_batch.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
preview_card_batch.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
preview_card_provider_batch.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
redirect.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00
status_batch.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
tag_batch.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
two_factor_confirmation.rb	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	2019-09-18 02:48:40 +02:00