Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.

2024-11-03 20:51:58 +01:00

..

disputes

Use async_count in more view locations (#32086)

2024-10-04 12:29:43 +00:00

reports

…

settings

…

trends

Add coverage for StatusTrend and PreviewCardTrend models, add locales class method to RankedTrend (#32688)

2024-10-29 15:46:32 +00:00

users

…

webhooks

…

account_actions_controller.rb

…

account_moderation_notes_controller.rb

Fix sort order of moderation notes on Reports and Accounts (#31528)

2024-09-06 14:58:36 +00:00

accounts_controller.rb

Fix sort order of moderation notes on Reports and Accounts (#31528)

2024-09-06 14:58:36 +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

Use async_count in more view locations (#32086)

2024-10-04 12:29:43 +00:00

base_controller.rb

Set "admin" body class from admin nested layout (#31269)

2024-09-06 13:58:46 +00: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

Use async count in admin dashboard (#30606)

2024-09-06 16:52:35 +00:00

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

Extract PERMITTED_PARAMS constant from admin/domain_blocks controller (#30380)

2024-06-11 09:40:47 +00:00

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

Add audit logs to Admin::InstancesController (#27386)

2024-07-23 08:12:30 +00:00

invites_controller.rb

…

ip_blocks_controller.rb

…

relationships_controller.rb

…

relays_controller.rb

…

report_notes_controller.rb

Fix sort order of moderation notes on Reports and Accounts (#31528)

2024-09-06 14:58:36 +00:00

reports_controller.rb

Fix sort order of moderation notes on Reports and Accounts (#31528)

2024-09-06 14:58:36 +00:00

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

Implement UI for Admin Search of Hashtags (#30880)

2024-07-29 15:49:44 +00:00

warning_presets_controller.rb

…

webhooks_controller.rb

…