You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
account_batch.rb	Add cold-start follow recommendations (#15945)	4 years ago
admin_settings.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
challenge.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
custom_emoji_batch.rb	Cache result of SQL (#14534)	4 years ago
delete_confirmation.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
ip_block_batch.rb	Add IP-based rules (#14963)	4 years ago
redirect.rb	Remove dependency on goldfinger gem (#14919)	4 years ago
status_batch.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
tag_batch.rb	Add batch approve/reject for pending hashtags in admin UI (#11791)	5 years ago
two_factor_confirmation.rb	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	5 years ago