Claire 72affd6b45 Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
  Conflict because of upstream VS glitch-soc repos.
  Updated version number as upstream did, but kept glitch-soc repos.

2025-07-24 18:10:38 +02:00

..

development.rb

Enables cross-origin Web Workers (#35483)

2025-07-24 07:14:27 +00:00

production.rb

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

2025-06-30 17:52:22 +02:00

test.rb

Use config_for for VAPID key storage (#34845)

2025-05-30 07:00:33 +00:00