Mastodon

History

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

account_actions

Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899 )

2024-09-13 09:11:10 +00:00

account_warnings

Add material design icons to admin/settings views (#27780 )

2024-04-23 16:43:49 +00:00

accounts

Profile: Remove old classes (#38920 )

2026-05-07 09:41:03 +00:00

action_logs

Move admin action log type list generation to helper (#32178 )

2024-10-02 14:47:00 +00:00

announcements

Reduce haml-lint LineLength configuration to 240 (#37287 )

2026-03-02 14:43:57 +00:00

change_emails

…

collections

Add batch actions to collections and possibility to report multiple collections (#38991 )

2026-05-12 16:13:01 +00:00

custom_emojis

Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream

2026-03-02 12:19:02 +01:00

dashboard

Use collection render on admin dashboard system checks (#35976 )

2026-01-26 09:43:30 +00:00

disputes/appeals

Use async_count in more view locations (#32086 )

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

domain_allows

Use "namespace style" for URL generation in admin/ area forms (#35080 )

2026-01-29 15:56:10 +00:00

domain_blocks

Use "namespace style" for URL generation in admin/ area forms (#35080 )

2026-01-29 15:56:10 +00:00

email_domain_blocks

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

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

email_subscriptions

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

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

export_domain_allows

Fix haml-lint LineLength cops in app/views/admin (#28680 )

2024-03-15 11:19:00 +00:00

export_domain_blocks

Add ContentPoliciesHelper#policy_list to wrap string building in views (#37856 )

2026-02-13 15:54:41 +00:00

fasp

Revamp heading levels in settings & admin pages (#38230 )

2026-03-17 10:32:24 +00:00

follow_recommendations

Fix unnecessary downcasing of some words in moderation/settings interface (#37364 )

2026-01-07 15:34:39 +00:00

instances

Add ContentPoliciesHelper#policy_list to wrap string building in views (#37856 )

2026-02-13 15:54:41 +00:00

invites

Change how invalid-but-not-expired invites are shown in moderation interface (#38736 )

2026-05-04 11:38:11 +00:00

ip_blocks

Use model constants more consistently for view expiration collections (#38589 )

2026-04-17 13:57:18 +00:00

relationships

Convert form_for -> form_with in views (#30700 )

2024-06-14 09:54:22 +00:00

relays

Use "namespace style" for URL generation in admin/ area forms (#35080 )

2026-01-29 15:56:10 +00:00

report_notes

Implement Instance Moderation Notes (#31529 )

2025-06-25 08:15:44 +00:00

reports

Remove collections feature flag (#39211 )

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

roles

Remove collections feature flag (#39211 )

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

rules

Revamp heading levels in settings & admin pages (#38230 )

2026-03-17 10:32:24 +00:00

settings

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

2026-05-26 20:48:49 +02:00

shared

Add batch actions to collections and possibility to report multiple collections (#38991 )

2026-05-12 16:13:01 +00:00

software_updates

Use collection partial for "software updates" list in admin area (#38550 )

2026-04-03 13:28:50 +00:00

status_edits

Refactor to reuse the one status partial across moderation tools (#35644 )

2025-08-21 14:51:11 +00:00

statuses

Implement quote posts in Moderator UI (#35964 )

2025-10-16 13:40:24 +00:00

system_check/messages

Use collection render on admin dashboard system checks (#35976 )

2026-01-26 09:43:30 +00:00