Claire 73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.

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

..

about

…

accounts

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

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

admin

Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream

2026-03-02 18:11:45 +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 '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream

2026-03-14 11:41:24 +01:00

custom_css

…

disputes/strikes

…

errors

…

filters

Extract filter_keywords helper method for listing filter keyword groups (#35921)

2025-12-17 14:48:58 +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

…

layouts

Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream

2026-03-14 11:41:24 +01:00

mail_subscriptions

Fix missing button styles on some forms (#33771)

2025-01-29 10:36:24 +00: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

…

redirects

…

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

Fix linting issue

2026-03-02 18:59: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

…

tags

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

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

terms_of_service

…

terms_of_service_interstitial

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

2026-03-09 09:38:00 +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