[DRE-commits] [ruby-doorkeeper] 01/04: Merge tag 'upstream/4.2.0'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Aug 23 10:34:04 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 7963f8265823e1e6dcda5776897dd49b7b5214fd
Merge: f5ae69e cf7817a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue Aug 23 14:14:08 2016 +0530
Merge tag 'upstream/4.2.0'
Upstream version 4.2.0
# gpg: Signature made Tuesday 23 August 2016 02:14:07 PM IST using RSA key ID CE1F9C674512C22A
# gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
# gpg: aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
# gpg: aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
# gpg: aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
# gpg: aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]
.travis.yml | 18 +-
CONTRIBUTING.md | 2 +
Gemfile | 12 +-
NEWS.md | 72 ++-
README.md | 107 +++--
Rakefile | 2 +-
.../doorkeeper/application_controller.rb | 4 +-
.../doorkeeper/application_metal_controller.rb | 5 +-
.../doorkeeper/applications_controller.rb | 4 +-
.../doorkeeper/authorizations_controller.rb | 2 +-
.../authorized_applications_controller.rb | 2 +-
app/controllers/doorkeeper/tokens_controller.rb | 64 ++-
app/helpers/doorkeeper/dashboard_helper.rb | 24 +-
app/views/doorkeeper/applications/show.html.erb | 2 +-
app/views/layouts/doorkeeper/admin.html.erb | 2 +-
config/locales/en.yml | 1 +
doorkeeper.gemspec | 13 +-
lib/doorkeeper.rb | 2 +-
lib/doorkeeper/config.rb | 34 +-
lib/doorkeeper/engine.rb | 18 +-
lib/doorkeeper/helpers/controller.rb | 2 +-
lib/doorkeeper/models/access_grant_mixin.rb | 14 +-
lib/doorkeeper/models/access_token_mixin.rb | 50 ++-
lib/doorkeeper/models/application_mixin.rb | 10 +-
lib/doorkeeper/models/concerns/expirable.rb | 4 +-
lib/doorkeeper/models/concerns/ownership.rb | 7 +-
lib/doorkeeper/models/concerns/revocable.rb | 21 +-
lib/doorkeeper/oauth/authorization/uri_builder.rb | 2 +-
lib/doorkeeper/oauth/client/credentials.rb | 2 +-
lib/doorkeeper/oauth/client_credentials/issuer.rb | 3 +-
lib/doorkeeper/oauth/client_credentials_request.rb | 11 +-
lib/doorkeeper/oauth/code_response.rb | 27 +-
lib/doorkeeper/oauth/helpers/scope_checker.rb | 2 +-
lib/doorkeeper/oauth/helpers/uri_checker.rb | 3 +-
.../oauth/password_access_token_request.rb | 16 +-
lib/doorkeeper/oauth/refresh_token_request.rb | 34 +-
lib/doorkeeper/oauth/scopes.rb | 4 +-
lib/doorkeeper/oauth/token.rb | 11 +-
lib/doorkeeper/oauth/token_response.rb | 2 +-
lib/doorkeeper/orm/active_record.rb | 16 -
lib/doorkeeper/orm/active_record/access_token.rb | 8 +
lib/doorkeeper/orm/active_record/application.rb | 9 +-
lib/doorkeeper/rails/helpers.rb | 2 +-
lib/doorkeeper/rails/routes.rb | 3 +-
lib/doorkeeper/rails/routes/mapper.rb | 2 +-
lib/doorkeeper/request/password.rb | 12 +-
lib/doorkeeper/version.rb | 2 +-
.../doorkeeper/application_scopes_generator.rb | 34 --
.../doorkeeper/previous_refresh_token_generator.rb | 29 ++
.../add_owner_to_application_migration.rb | 2 +-
.../add_previous_refresh_token_to_access_tokens.rb | 11 +
.../templates/add_scopes_to_oauth_applications.rb | 5 -
lib/generators/doorkeeper/templates/initializer.rb | 11 +-
lib/generators/doorkeeper/templates/migration.rb | 28 +-
metadata.yml | 483 ---------------------
spec/controllers/application_metal_controller.rb | 10 +
spec/controllers/authorizations_controller_spec.rb | 14 -
.../protected_resources_controller_spec.rb | 65 ++-
spec/controllers/tokens_controller_spec.rb | 2 +-
.../full_protected_resources_controller.rb | 8 +-
spec/dummy/app/controllers/home_controller.rb | 2 +-
spec/dummy/app/controllers/metal_controller.rb | 2 +-
.../semi_protected_resources_controller.rb | 6 +-
spec/dummy/app/models/user.rb | 4 -
spec/dummy/config/application.rb | 38 +-
spec/dummy/config/environment.rb | 2 +-
spec/dummy/config/environments/test.rb | 19 +-
...active_record_belongs_to_required_by_default.rb | 6 +
spec/dummy/config/initializers/doorkeeper.rb | 4 +-
...41209001746_add_scopes_to_oauth_applications.rb | 5 -
... => 20151223192035_create_doorkeeper_tables.rb} | 29 +-
... => 20151223200000_add_owner_to_application.rb} | 0
..._add_previous_refresh_token_to_access_tokens.rb | 11 +
spec/dummy/db/schema.rb | 45 +-
spec/factories.rb | 4 +-
spec/lib/config_spec.rb | 21 +-
spec/lib/models/revocable_spec.rb | 31 +-
spec/lib/oauth/authorization_code_request_spec.rb | 2 +-
spec/lib/oauth/code_response_spec.rb | 34 ++
.../oauth/password_access_token_request_spec.rb | 10 +-
spec/lib/oauth/refresh_token_request_spec.rb | 37 +-
spec/lib/oauth/scopes_spec.rb | 1 -
spec/lib/oauth/token_spec.rb | 17 +-
spec/models/doorkeeper/access_token_spec.rb | 46 +-
spec/models/doorkeeper/application_spec.rb | 14 +-
spec/requests/flows/password_spec.rb | 31 +-
spec/requests/flows/refresh_token_spec.rb | 104 ++++-
spec/requests/flows/revoke_token_spec.rb | 186 ++++----
spec/spec_helper_integration.rb | 3 +
spec/support/helpers/model_helper.rb | 32 +-
spec/support/http_method_shim.rb | 24 +
spec/support/shared/controllers_shared_context.rb | 17 +-
spec/support/shared/models_shared_examples.rb | 2 +-
93 files changed, 1103 insertions(+), 1057 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