Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.		2024-05-06 17:53:51 +02:00
..
disputes	…
reports	…
settings	…
trends	…
users	…
webhooks	…
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	Allow unblocking email addresses from any matching account (#29305)	2024-03-20 14:38:00 +00:00
action_logs_controller.rb	Add `Account.auditable` scope, fix N+1 in admin/action_logs#index (#28812)	2024-01-19 01:39:30 +00:00
announcements_controller.rb	…
base_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
change_emails_controller.rb	…
confirmations_controller.rb	Fix `Style/GuardClause` cop in app/controllers (#28420)	2024-01-25 15:13:41 +00:00
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_allows_controller.rb	Fix missing destory audit logs for Domain Allows (#30125)	2024-04-30 08:48:02 +00:00
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	Fix remaining `Rails/WhereExists` cop violations, regenerate todo (#28892)	2024-01-25 12:37:07 +00:00
export_domain_allows_controller.rb	…
export_domain_blocks_controller.rb	Add specs for `Instance` model scopes and add `with_domain_follows` scope (#28767)	2024-01-25 15:28:27 +00: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	Add hints for rules (#29539)	2024-03-11 08:57:07 +00:00
settings_controller.rb	…
site_uploads_controller.rb	Redirect back after site upload deletion (#30141)	2024-05-06 13:31:39 +00:00
software_updates_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…
warning_presets_controller.rb	…
webhooks_controller.rb	…