This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
disputes	…
reports	Add confirmation screen when handling reports (#22375)	2023-01-18 16:40:09 +01:00
settings	…
trends	…
users	…
webhooks	…
account_actions_controller.rb	Add confirmation screen when handling reports (#22375)	2023-01-18 16:40:09 +01:00
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
announcements_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
export_domain_allows_controller.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2023-01-18 16:20:52 +01:00
export_domain_blocks_controller.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2023-01-18 16:20:52 +01:00
follow_recommendations_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
ip_blocks_controller.rb	…
relationships_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
rules_controller.rb	…
settings_controller.rb	…
site_uploads_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…
warning_presets_controller.rb	…
webhooks_controller.rb	…