Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.		2024-05-06 17:53:51 +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 '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +02: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	…
import.rb	Ensure case-insensitive fields are converted to lowercase in user imports (#29740)	2024-03-26 09:30:10 +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	…
two_factor_confirmation.rb	…