[DRE-commits] [ruby-doorkeeper] 01/04: Merge tag 'upstream/3.1.0'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Mon May 30 19:02:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-doorkeeper.
commit 6e1572cf51e25b3e1c0cac98bdd68f37d1ddb84a
Merge: 67d2dad 471978b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue May 31 00:04:40 2016 +0530
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
# gpg: Signature made Tuesday 31 May 2016 12:04:34 AM IST using RSA key ID 4512C22A
# gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
# gpg: aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
# gpg: aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
# gpg: aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
# gpg: aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
.hound.yml | 4 +
.travis.yml | 29 +----
CHANGELOG.md | 1 -
Gemfile | 3 +
NEWS.md | 68 +++++++++++
README.md | 59 +++-------
RELEASING.md | 4 +-
.../stylesheets/doorkeeper/admin/application.css | 6 +-
.../doorkeeper/applications_controller.rb | 4 +-
app/helpers/doorkeeper/dashboard_helper.rb | 2 +-
app/validators/redirect_uri_validator.rb | 2 +-
app/views/doorkeeper/applications/_form.html.erb | 15 ++-
app/views/doorkeeper/applications/show.html.erb | 5 +-
app/views/doorkeeper/authorizations/new.html.erb | 2 +-
app/views/layouts/doorkeeper/admin.html.erb | 7 +-
config/locales/en.yml | 36 +-----
doorkeeper.gemspec | 6 +-
gemfiles/Gemfile.common.rb | 7 --
gemfiles/Gemfile.mongo_mapper.rb | 5 -
gemfiles/Gemfile.mongoid2.rb | 5 -
gemfiles/Gemfile.mongoid3.rb | 4 -
gemfiles/Gemfile.mongoid4.rb | 4 -
lib/doorkeeper.rb | 4 -
lib/doorkeeper/engine.rb | 4 +-
lib/doorkeeper/errors.rb | 6 +
.../doorkeeper/mongo_mapper/indexes_generator.rb | 12 --
.../doorkeeper/mongo_mapper/templates/indexes.rb | 3 -
lib/doorkeeper/grape/helpers.rb | 2 +-
lib/doorkeeper/helpers/controller.rb | 6 +
lib/doorkeeper/models/access_grant_mixin.rb | 3 +-
lib/doorkeeper/models/access_token_mixin.rb | 3 +-
lib/doorkeeper/models/application_mixin.rb | 25 ++--
lib/doorkeeper/models/concerns/revocable.rb | 4 +-
lib/doorkeeper/oauth/authorization_code_request.rb | 15 ++-
lib/doorkeeper/oauth/client_credentials/creator.rb | 7 +-
lib/doorkeeper/oauth/error.rb | 6 +-
lib/doorkeeper/oauth/helpers/scope_checker.rb | 2 +-
lib/doorkeeper/oauth/refresh_token_request.rb | 9 +-
lib/doorkeeper/orm/active_record.rb | 7 +-
lib/doorkeeper/orm/active_record/access_grant.rb | 4 +-
lib/doorkeeper/orm/active_record/access_token.rb | 4 +-
lib/doorkeeper/orm/active_record/application.rb | 4 +-
lib/doorkeeper/orm/mongo_mapper.rb | 19 ---
lib/doorkeeper/orm/mongo_mapper/access_grant.rb | 24 ----
lib/doorkeeper/orm/mongo_mapper/access_token.rb | 43 -------
lib/doorkeeper/orm/mongo_mapper/application.rb | 32 -----
lib/doorkeeper/orm/mongoid2.rb | 19 ---
lib/doorkeeper/orm/mongoid2/access_grant.rb | 22 ----
lib/doorkeeper/orm/mongoid2/access_token.rb | 37 ------
lib/doorkeeper/orm/mongoid2/application.rb | 25 ----
lib/doorkeeper/orm/mongoid2/concerns/scopes.rb | 30 -----
lib/doorkeeper/orm/mongoid3.rb | 19 ---
lib/doorkeeper/orm/mongoid3/access_grant.rb | 22 ----
lib/doorkeeper/orm/mongoid3/access_token.rb | 37 ------
lib/doorkeeper/orm/mongoid3/application.rb | 25 ----
lib/doorkeeper/orm/mongoid3/concerns/scopes.rb | 30 -----
lib/doorkeeper/orm/mongoid4.rb | 19 ---
lib/doorkeeper/orm/mongoid4/access_grant.rb | 22 ----
lib/doorkeeper/orm/mongoid4/access_token.rb | 37 ------
lib/doorkeeper/orm/mongoid4/application.rb | 25 ----
lib/doorkeeper/orm/mongoid4/concerns/scopes.rb | 17 ---
lib/doorkeeper/rails/helpers.rb | 46 +++-----
lib/doorkeeper/request.rb | 26 +++--
lib/doorkeeper/request/authorization_code.rb | 25 ++--
lib/doorkeeper/request/client_credentials.rb | 24 ++--
lib/doorkeeper/request/code.rb | 20 ++--
lib/doorkeeper/request/password.rb | 25 ++--
lib/doorkeeper/request/refresh_token.rb | 24 ++--
lib/doorkeeper/request/strategy.rb | 17 +++
lib/doorkeeper/request/token.rb | 20 ++--
lib/doorkeeper/server.rb | 4 +-
lib/doorkeeper/version.rb | 2 +-
lib/generators/doorkeeper/templates/README | 20 ----
lib/generators/doorkeeper/templates/initializer.rb | 4 +-
lib/generators/doorkeeper/templates/migration.rb | 8 ++
metadata.yml | 110 ++----------------
.../protected_resources_controller_spec.rb | 129 ++++++++++++++++++---
spec/controllers/tokens_controller_spec.rb | 30 +++++
spec/dummy/app/models/user.rb | 26 +----
spec/dummy/config/application.rb | 1 -
spec/dummy/config/initializers/doorkeeper.rb | 2 -
spec/dummy/config/mongo.yml | 11 --
spec/dummy/config/mongoid2.yml | 9 --
spec/dummy/config/mongoid3.yml | 18 ---
spec/dummy/config/mongoid4.yml | 19 ---
spec/helpers/doorkeeper/dashboard_helper_spec.rb | 24 ++++
spec/lib/models/revocable_spec.rb | 4 +-
spec/lib/oauth/client_credentials/creator_spec.rb | 26 ++++-
spec/lib/oauth/error_response_spec.rb | 14 +--
spec/lib/oauth/error_spec.rb | 14 ++-
spec/lib/oauth/helpers/scope_checker_spec.rb | 6 +-
spec/lib/oauth/scopes_spec.rb | 2 +-
spec/lib/oauth/token_request_spec.rb | 3 +
spec/lib/request/strategy_spec.rb | 53 +++++++++
spec/lib/server_spec.rb | 2 +-
spec/models/doorkeeper/access_grant_spec.rb | 10 +-
spec/models/doorkeeper/access_token_spec.rb | 10 +-
spec/models/doorkeeper/application_spec.rb | 29 +++--
spec/requests/flows/authorization_code_spec.rb | 26 +++++
spec/requests/flows/refresh_token_spec.rb | 8 ++
spec/spec_helper_integration.rb | 15 +--
spec/support/orm/mongo_mapper.rb | 10 --
spec/support/orm/mongoid.rb | 10 --
spec/support/shared/models_shared_examples.rb | 2 +-
spec/validators/redirect_uri_validator_spec.rb | 5 +
105 files changed, 671 insertions(+), 1134 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-doorkeeper.git
More information about the Pkg-ruby-extras-commits
mailing list