catstodon/app/controllers/api
Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
2021-03-02 12:06:58 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2021-03-02 12:06:58 +01:00
v2 Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
web Refactor Api::Web::SettingsController (#15717) 2021-02-12 07:19:15 +01:00
base_controller.rb Add stoplight for object storage failures, return HTTP 503 (#13043) 2020-12-15 12:55:29 +01: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