Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.		2023-03-05 20:46:56 +01:00
..
account_batch.rb	Fix server error when failing to follow back followers from /relationships (#23787)	2023-03-03 20:36:18 +01:00
admin_settings.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01: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
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	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
two_factor_confirmation.rb