Mastodon

History

Claire 4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream

Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.

2026-02-11 13:32:18 +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 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream

2026-01-29 21:08:46 +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 'a6883242e3d9f9ed85806b66d40e1a148972bc3c' into glitch-soc/merge-upstream

2026-01-28 19:54:41 +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

…

kaminari

…

layouts

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

2026-02-11 13:32:18 +01:00

mail_subscriptions

…

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

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

2026-02-11 13:32:18 +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 '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream

2025-05-30 17:41:31 +02:00

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

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

statuses

Remove unneeded type check on Status in og_image partial (#36980 )

2025-11-21 14:29:03 +00:00

statuses_cleanup

…