[DRE-commits] [ruby-devise] 01/02: Merge tag 'upstream/4.2.0'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-devise.

commit e7f0f689508e4cbc87c432fefe94879b3130f197
Merge: 0feeda6 759b025
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Sep 18 08:32:32 2016 +0530

    Merge tag 'upstream/4.2.0'
    
    Upstream version 4.2.0
    
    # gpg: Signature made Sunday 18 September 2016 08:32:31 AM 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                                        |  16 +-
 CHANGELOG.md                                       |  48 ++++-
 CONTRIBUTING.md                                    |  37 +++-
 Gemfile                                            |  21 ++-
 Gemfile.lock                                       | 177 +++++++++---------
 README.md                                          | 126 +++++++++----
 .../devise/omniauth_callbacks_controller.rb        |   6 +-
 app/controllers/devise/registrations_controller.rb |   6 +-
 app/views/devise/registrations/edit.html.erb       |   4 +
 gemfiles/Gemfile.rails-4.1-stable                  |   8 +-
 gemfiles/Gemfile.rails-4.1-stable.lock             |  50 +++---
 gemfiles/Gemfile.rails-4.2-stable                  |   8 +-
 gemfiles/Gemfile.rails-4.2-stable.lock             | 112 ++++++------
 gemfiles/Gemfile.rails-5.0-beta                    |  37 ----
 gemfiles/Gemfile.rails-5.0-beta.lock               | 199 ---------------------
 guides/bug_report_templates/integration_test.rb    | 104 +++++++++++
 lib/devise.rb                                      |  35 ++--
 lib/devise/controllers/helpers.rb                  |  13 +-
 lib/devise/controllers/rememberable.rb             |   2 +-
 lib/devise/controllers/sign_in_out.rb              |  35 ++--
 lib/devise/failure_app.rb                          |  42 +++--
 lib/devise/hooks/proxy.rb                          |   2 +-
 lib/devise/models/authenticatable.rb               |  25 ++-
 lib/devise/models/confirmable.rb                   |  20 ++-
 lib/devise/models/database_authenticatable.rb      |   5 -
 lib/devise/models/recoverable.rb                   |  25 ++-
 lib/devise/omniauth/url_helpers.rb                 |  51 ------
 lib/devise/orm/active_record.rb                    |   4 +-
 lib/devise/orm/mongoid.rb                          |   6 +-
 lib/devise/parameter_sanitizer.rb                  |  55 ------
 lib/devise/rails.rb                                |   4 +-
 lib/devise/test/controller_helpers.rb              | 162 +++++++++++++++++
 lib/devise/test/integration_helpers.rb             |  61 +++++++
 lib/devise/test_helpers.rb                         | 134 +-------------
 lib/devise/version.rb                              |   2 +-
 lib/generators/templates/README                    |   9 +-
 lib/generators/templates/devise.rb                 |   6 +
 .../custom_registrations_controller_test.rb        |   2 +-
 test/controllers/custom_strategy_test.rb           |   2 +-
 test/controllers/helpers_test.rb                   |   8 +-
 test/controllers/internal_helpers_test.rb          |   2 +-
 test/controllers/passwords_controller_test.rb      |   2 +-
 test/controllers/sessions_controller_test.rb       |   4 +-
 test/devise_test.rb                                |  18 +-
 test/failure_app_test.rb                           |  18 ++
 test/integration/authenticatable_test.rb           |  72 ++++----
 test/integration/confirmable_test.rb               |  14 +-
 test/integration/database_authenticatable_test.rb  |  10 +-
 test/integration/http_authenticatable_test.rb      |   4 +-
 test/integration/lockable_test.rb                  |   2 +-
 test/integration/mounted_engine_test.rb            |  36 ++++
 test/integration/omniauthable_test.rb              |   2 +-
 test/integration/recoverable_test.rb               |   8 +-
 test/integration/registerable_test.rb              |  18 +-
 test/integration/rememberable_test.rb              |  20 +--
 test/integration/timeoutable_test.rb               |  10 +-
 test/mapping_test.rb                               |   2 +-
 test/models/confirmable_test.rb                    |  58 +++---
 test/models/database_authenticatable_test.rb       |  26 +--
 test/models/lockable_test.rb                       |  32 ++--
 test/models/omniauthable_test.rb                   |   2 +-
 test/models/recoverable_test.rb                    |  20 +--
 test/models/registerable_test.rb                   |   2 +-
 test/models/rememberable_test.rb                   |  19 +-
 test/models/serializable_test.rb                   |   5 +
 test/models/timeoutable_test.rb                    |  14 +-
 test/models/trackable_test.rb                      |   2 +-
 test/models/validatable_test.rb                    |   2 +-
 test/models_test.rb                                |   4 +-
 test/parameter_sanitizer_test.rb                   |  56 ------
 .../users/omniauth_callbacks_controller.rb         |   2 +-
 test/rails_app/config/environments/production.rb   |   4 +-
 test/rails_app/config/environments/test.rb         |  11 +-
 .../db/migrate/20100401102949_create_tables.rb     |   6 +-
 test/support/assertions.rb                         |  11 --
 .../controller_helpers_test.rb}                    |   4 +-
 test/test/integration_helpers_test.rb              |  32 ++++
 77 files changed, 1179 insertions(+), 1044 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-devise.git