Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.

2024-09-16 21:08:58 +02:00

..

v1

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +02:00

v2

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

2024-09-16 21:08:58 +02:00

v2_alpha

Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840)

2024-09-16 12:10:02 +00:00

web

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00

oembed_spec.rb

Convert api/oembed controller spec to request spec (#31605)

2024-08-27 07:55:25 +00:00