Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01:00
..
disputes	…
reports	…
settings	…
trends	…
users	…
webhooks	…
account_actions_controller.rb	…
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	Add ability to require approval when users sign up using specific email domains (#28468)	2024-01-04 09:07:05 +00:00
export_domain_allows_controller.rb	…
export_domain_blocks_controller.rb	Fix intermittent failure from unspecified order in `export_domain_blocks` controller spec (#28562)	2024-01-03 13:06:15 +00:00
follow_recommendations_controller.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
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	…
software_updates_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…
warning_presets_controller.rb	…
webhooks_controller.rb	…