mastodon/spec/controllers/api
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
v2
web
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