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

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

web

Lint pass (#8876)

2018-10-04 12:36:53 +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