mastodon/spec/controllers/api
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 Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
web Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
base_controller_spec.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02: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
proofs_controller_spec.rb Fix base64-encoded file uploads not being possible (#12748) 2020-01-04 01:54:07 +01:00