Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

2022-01-17 10:45:25 +01:00

..

account_batch.rb

Add batch suspend for accounts in admin UI (#17009)

2021-12-05 21:48:39 +01:00

admin_settings.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-26 22:53:55 +01: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

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