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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

2021-10-25 20:28:51 +02:00

..

v1

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

2021-10-25 20:28:51 +02: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

proofs_controller.rb

Fix proofs API being inaccessible in secure mode (#12495)

2019-11-28 04:07:49 +01:00