mastodon-glitch/app/models/form
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01: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 '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 2023-12-21 19:31:12 +01:00
challenge.rb
custom_emoji_batch.rb Fix `Style/CombinableLoops` cop (#27429) 2023-10-16 16:36:28 +02: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 Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01:00
import.rb Fix `Style/RedundantReturn` cop (#28391) 2023-12-18 09:50:51 +00:00
ip_block_batch.rb Fix `Style/CombinableLoops` cop (#27429) 2023-10-16 16:36:28 +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