Claire d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream ...

Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.

2023-10-08 16:41:56 +02:00

..

account_batch.rb

Fix reports not being closed when performing batch suspensions (#24988)

2023-05-16 14:56:49 +02:00

admin_settings.rb

Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream

2023-09-02 14:44:47 +02:00

challenge.rb

…

custom_emoji_batch.rb

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09:00

delete_confirmation.rb

…

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

…

import.rb

Extract filename and csv helper methods from Form::Import (#26129)

2023-09-28 16:22:05 +02:00

ip_block_batch.rb

…

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

…

two_factor_confirmation.rb

…