Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

2026-06-09 21:30:54 +02:00

..

announcements

…

disputes

Fix wrong policy authorization in admin controllers (#35588)

2025-07-30 13:17:53 +00:00

email_subscriptions

Add ability to view individual newsletters in admin UI (#39271)

2026-06-08 07:05:27 +00:00

fasp

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

2026-02-17 14:56:46 +00:00

instances

Use consistent calling style for TagManager#normalize_domain (#35764)

2026-02-27 16:38:34 +00:00

reports

Split status batch and moderation actions (#37970)

2026-02-25 10:07:46 +00:00

settings

…

terms_of_service

…

trends

Limit count to pending&trending on admin/trends/tags page (#35120)

2025-06-23 13:30:12 +00:00

users

…

webhooks

…

account_actions_controller.rb

Fix error handling for blank actions in account moderation action form (#35246)

2025-07-03 14:42:48 +00:00

account_moderation_notes_controller.rb

…

accounts_controller.rb

Combine assignment params in admin/accounts#batch action (#35463)

2025-07-23 07:59:14 +00:00

action_logs_controller.rb

Sort auditable accounts (#35272)

2025-07-30 15:08:05 +00:00

announcements_controller.rb

…

base_controller.rb

…

change_emails_controller.rb

…

collections_controller.rb

Add batch remove for collections in reports (#39020)

2026-05-18 14:53:40 +00:00

confirmations_controller.rb

Set flash options via redirect where possible (#35370)

2025-07-24 08:03:28 +00:00

custom_emojis_controller.rb

Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream

2026-06-01 18:00:03 +02:00

dashboard_controller.rb

Use tag filter for pending tag count on admin dashboard (#36404)

2025-10-09 08:08:29 +00:00

domain_allows_controller.rb

…

domain_blocks_controller.rb

Use consistent calling style for TagManager#normalize_domain (#35764)

2026-02-27 16:38:34 +00:00

email_domain_blocks_controller.rb

Add ability to search email blocks by domain (#38923)

2026-05-06 15:54:12 +00:00

email_subscriptions_controller.rb

Add ability to view individual newsletters in admin UI (#39271)

2026-06-08 07:05:27 +00:00

export_domain_allows_controller.rb

Use pluck on DomainAllow.allowed_domains for export (#36019)

2025-09-05 12:30:18 +00:00

export_domain_blocks_controller.rb

…

follow_recommendations_controller.rb

…

instances_controller.rb

Use consistent calling style for TagManager#normalize_domain (#35764)

2026-02-27 16:38:34 +00:00

invites_controller.rb

…

ip_blocks_controller.rb

…

relationships_controller.rb

…

relays_controller.rb

…

report_notes_controller.rb

Remove collections feature flag (#39211)

2026-05-29 09:37:42 +00:00

reports_controller.rb

Add batch remove for collections in reports (#39020)

2026-05-18 14:53:40 +00:00

resets_controller.rb

…

roles_controller.rb

Role "collection limit" setting missing in params (#38794)

2026-04-23 13:32:12 +00:00

rules_controller.rb

Change rule translation interface to display english name and populate empty translations (#35170)

2025-06-25 10:02:19 +00:00

settings_controller.rb

Set flash options via redirect where possible (#35370)

2025-07-24 08:03:28 +00:00

site_uploads_controller.rb

Fix Rails/RedirectBackOrTo cop (#36930)

2025-11-19 09:28:43 +00:00

software_updates_controller.rb

…

statuses_controller.rb

Extract common lists for status/reblog preload/cacheable (#35285)

2026-03-23 15:53:56 +00:00

tags_controller.rb

Use report_range method in admin/tags to generate reporting period (#35465)

2025-07-23 08:02:07 +00:00

terms_of_service_controller.rb

…

username_blocks_controller.rb

Add ability to block words in usernames (#35407)

2025-07-29 10:19:15 +00:00

warning_presets_controller.rb

…

webhooks_controller.rb

…