Claire 48ec31bec8 Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.

2025-10-28 22:10:12 +01:00

..

fasp

Update to linzer 0.7 (#34765)

2025-05-23 06:43:02 +00:00

v1

Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream

2025-10-28 22:10:12 +01:00

v1_alpha

Experimental Async Refreshes API (#34918)

2025-06-12 14:54:00 +00:00

v2

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

2025-08-05 15:46:33 +02:00

web

Silence json key duplicate warning from api/web/push_subscriptions (#35481)

2025-07-24 07:33:53 +00:00

base_controller.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

oembed_controller.rb

Move default embed size knowledge into OEmbedSerializer (#31990)

2024-09-20 12:39:48 +00:00