Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream ... Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test.		2025-01-27 18:19:09 +01:00
..
disputes	…
reports	…
settings	…
terms_of_service	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
trends	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
users	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
webhooks	…
account_actions_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
account_moderation_notes_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
accounts_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
action_logs_controller.rb	…
announcements_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
base_controller.rb	…
change_emails_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
confirmations_controller.rb	…
custom_emojis_controller.rb	Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream	2025-01-27 18:19:09 +01:00
dashboard_controller.rb	…
domain_allows_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
domain_blocks_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
email_domain_blocks_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
export_domain_allows_controller.rb	…
export_domain_blocks_controller.rb	…
follow_recommendations_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
instances_controller.rb	…
invites_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
ip_blocks_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
relationships_controller.rb	…
relays_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
report_notes_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
rules_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
settings_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
site_uploads_controller.rb	…
software_updates_controller.rb	…
statuses_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
tags_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
terms_of_service_controller.rb	…
warning_presets_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00
webhooks_controller.rb	Use `expect` for `admin/` controllers (#33686)	2025-01-27 14:05:16 +00:00