Claire f1a6f9062e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.

2022-02-10 19:09:27 +01:00

..

v1

Merge branch 'main' into glitch-soc/merge-upstream

2022-02-10 19:09:27 +01:00

v2

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

web

Add policy param to POST /api/v1/push/subscriptions (#16040)

2021-04-15 05:00:25 +02:00

base_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

oembed_controller_spec.rb

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00