Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.

2020-01-04 23:04:42 +01:00

..

v1

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-04 23:04:42 +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