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.

Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code		5 years ago
..
account_batch.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
custom_emoji_batch.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	5 years ago
delete_confirmation.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
migration.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	7 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