Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/content_security_policy.rb`:
  Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
  glitch-soc's `EXTRA_DATA_HOST`.
  Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.

2025-03-26 19:14:26 +01:00

..

v1

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

2025-03-25 19:59:59 +01:00

v2

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

2025-03-26 19:14:26 +01:00

web

Use expect for api/v1 and api/web push subs controllers (#33682)

2025-01-22 14:55:44 +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