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

Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code

2019-11-20 15:36:09 +01:00

..

v1

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

2019-11-20 15:36:09 +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

Add Keybase integration (#10297)

2019-03-18 21:00:55 +01:00