Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		2021-04-20 12:17:14 +02:00
..
account_batch.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
admin_settings.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
challenge.rb
custom_emoji_batch.rb	Cache result of SQL (#14534)	2020-08-09 15:23:42 +02:00
delete_confirmation.rb
ip_block_batch.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
redirect.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00
status_batch.rb
tag_batch.rb
two_factor_confirmation.rb