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	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
web	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	2021-04-15 05:00:25 +02:00
base_controller.rb	Add logging of S3-related errors (#16381)	2021-07-21 18:34:39 +02:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00