Claire 3a31ef11cc Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/post_status_service.rb`:
  Upstream updated the logic to move the CW to the text content.
  Glitch-soc does not move CW to text content but has some logic
  to avoid the text being empty. Update the logic according to upstream's
  change.
- `docker-compose.yml`:
  Conflict because of different paths for composer images.
  Updated version as upstream did while keeping our path.

2025-09-17 20:10:28 +02:00

..

fasp

Add support for FASP data sharing (#34415)

2025-05-16 12:24:02 +00:00

v1

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

2025-09-17 20:10:28 +02: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

Include update in the resources args for api/web/push_subscriptions route (#35801)

2025-08-18 07:35:56 +00:00

oembed_spec.rb

Add response.content_type checks for JSON to api/v1 request specs (#31981)

2024-09-20 13:13:04 +00:00