You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec/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.
5 years ago
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
v2
web Lint pass (#8876) 7 years ago
base_controller_spec.rb Change unconfirmed user login behaviour (#11375) 7 years ago
oembed_controller_spec.rb Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 7 years ago
proofs_controller_spec.rb Fix base64-encoded file uploads not being possible (#12748) 6 years ago