Claire 79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.

2026-03-25 21:36:32 +01:00

..

about

Fix titles being escaped twice (#32889)

2024-11-14 13:28:00 +00:00

accounts

Fix Accept headers when fetching AP objects to match spec (#30354)

2025-11-05 13:32:29 +00:00

admin

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

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

admin_mailer

Use Report#local? delegation more broadly (#37596)

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

application

Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream

2026-02-04 19:23:24 +01:00

auth

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

2026-03-19 12:38:31 +01:00

custom_css

Remove role color highlighting from custom css (#33493)

2025-01-07 16:28:35 +00:00

disputes/strikes

Include time portion in formatted datetimes when provided (#33191)

2025-01-08 14:26:08 +00:00

email_subscription_mailer

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

email_subscriptions/confirmations

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

errors

…

filters

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

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

follower_accounts

…

following_accounts

…

home

…

invites

Fix missing button styles on some forms (#33771)

2025-01-29 10:36:24 +00:00

kaminari

Migrate fontawesome->material in more views (#31360)

2024-08-20 11:52:45 +00:00

layouts

Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream

2026-03-25 21:36:32 +01:00

media

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

2025-05-25 14:36:51 +02:00

notification_mailer

Fix moderation warning e-mails that include posts (#36462)

2025-10-14 11:48:51 +00:00

oauth

Fix unfortunate action button wrapping in admin area (#36247)

2025-09-24 08:57:18 +00:00

privacy

Fix titles being escaped twice (#32889)

2024-11-14 13:28:00 +00:00

redirects

Change referrer policy to be controlled by header in web UI (#33214)

2024-12-09 22:42:45 +00:00

relationships

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

2026-01-10 13:12:36 +01:00

remote_interaction_helper

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

2025-05-25 14:36:51 +02:00

settings

Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream

2026-03-25 21:36:32 +01:00

severed_relationships

Fix layout of severed relationships when purged events are listed (#36593)

2025-10-27 15:19:38 +00:00

shared

Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream

2026-03-16 18:16:56 +01:00

shares

Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream

2026-03-16 18:16:56 +01:00

statuses

Use to_json in simple view hash data-props build locations (#38218)

2026-03-16 14:02:52 +00:00

statuses_cleanup

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

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

tags

Fix Accept headers when fetching AP objects to match spec (#30354)

2025-11-05 13:32:29 +00:00

terms_of_service

Add terms of service (#33055)

2024-12-09 10:04:46 +00:00

terms_of_service_interstitial

Add TermsOfService#usable_effective_date to DRY up view logic (#38095)

2026-03-09 09:38:00 +00:00

unsubscriptions

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

user_mailer

Add TermsOfService#usable_effective_date to DRY up view logic (#38095)

2026-03-09 09:38:00 +00:00

well_known/host_meta

…

wrapstodon

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

2026-01-15 18:02:35 +01:00