mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00

Files

Claire bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.

2026-03-17 18:53:00 +01: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

Show reported collections in moderation interface (#37898 )

2026-02-19 12:46:38 +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

Fix more haml-lint Rubocop (#24107 )

2023-03-15 20:07:43 +01:00

collections

Show reported collections in moderation interface (#37898 )

2026-02-19 12:46:38 +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

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

2026-01-29 15:56:10 +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

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

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

ip_blocks

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

2026-01-29 15:56:10 +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

Add moderation consequences for collections (#37974 )

2026-02-25 14:32:07 +00:00

roles

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

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

rules

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

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

settings

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

2026-03-17 18:53:00 +01:00

shared

Show reported collections in moderation interface (#37898 )

2026-02-19 12:46:38 +00:00

software_updates

Solve simplest haml-lint Rubocop lints (#27529 )

2023-10-25 12:38:01 +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