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

Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.

2022-12-07 09:03:42 +01:00

..

account_batch.rb

Change batch account suspension to create a strike (#20897)

2022-11-17 10:52:51 +01:00

admin_settings.rb

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

2022-10-28 19:23:58 +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

domain_block_batch.rb

Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)

2022-11-17 11:05:09 +01:00

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

Fix 500 error when trying to migrate to an invalid address (#21462)

2022-12-07 02:35:39 +01:00

status_filter_batch_action.rb

Add ability to filter individual posts (#18945)

2022-08-25 04:27:47 +02: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