[DRE-commits] [ruby-devise] 01/06: Merge tag 'upstream/3.5.6'

[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 6d388c127f4ae15c02bff1d3d1c4d53978553893
Merge: f5d9426 7d879e0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Feb 23 20:02:35 2016 +0530

    Merge tag 'upstream/3.5.6'
    
    Upstream version 3.5.6
    
    # gpg: Signature made Tuesday 23 February 2016 08:02:27 PM 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>"

 .travis.yml                                        |   5 +-
 CHANGELOG.md                                       |  32 ++++-
 CODE_OF_CONDUCT.md                                 |  22 ++++
 CONTRIBUTING.md                                    |   2 +
 Gemfile.lock                                       |  10 +-
 app/controllers/devise/passwords_controller.rb     |   1 +
 app/mailers/devise/mailer.rb                       |   4 +
 app/views/devise/mailer/password_change.html.erb   |   3 +
 app/views/devise/shared/_links.html.erb            |   2 +-
 config/locales/en.yml                              |   2 +
 gemfiles/Gemfile.rails-3.2-stable.lock             |   7 +-
 gemfiles/Gemfile.rails-4.0-stable.lock             |  60 ++++-----
 gemfiles/Gemfile.rails-4.1-stable.lock             |   7 +-
 gemfiles/Gemfile.rails-4.2-stable.lock             |  11 +-
 lib/devise.rb                                      |  16 ++-
 lib/devise/controllers/helpers.rb                  |  18 ++-
 lib/devise/controllers/rememberable.rb             |   9 +-
 lib/devise/failure_app.rb                          |  20 ++-
 lib/devise/hooks/timeoutable.rb                    |   8 +-
 lib/devise/models.rb                               |   2 +-
 lib/devise/models/confirmable.rb                   |   6 +-
 lib/devise/models/database_authenticatable.rb      |  14 +-
 lib/devise/models/recoverable.rb                   |  10 +-
 lib/devise/models/rememberable.rb                  |  60 ++++++---
 lib/devise/models/timeoutable.rb                   |   6 -
 lib/devise/rails/routes.rb                         |  20 ++-
 lib/devise/strategies/authenticatable.rb           |   2 +-
 lib/devise/version.rb                              |   2 +-
 lib/generators/devise/views_generator.rb           |  17 ++-
 lib/generators/templates/devise.rb                 |   3 +
 .../markerb/confirmation_instructions.markerb      |   2 +-
 .../templates/markerb/password_change.markerb      |   3 +
 .../markerb/reset_password_instructions.markerb    |   2 +-
 .../templates/markerb/unlock_instructions.markerb  |   2 +-
 metadata.yml                                       |  55 ++++----
 test/controllers/helper_methods_test.rb            |  21 +++
 test/failure_app_test.rb                           |  17 +++
 test/generators/views_generator_test.rb            |   7 +
 test/integration/omniauthable_test.rb              |  20 +--
 test/integration/rememberable_test.rb              |   4 +-
 test/integration/timeoutable_test.rb               |  14 +-
 test/models/confirmable_test.rb                    |  24 ++++
 test/models/database_authenticatable_test.rb       |  20 +++
 test/models/lockable_test.rb                       |   2 +-
 test/models/recoverable_test.rb                    |  23 ++++
 test/models/rememberable_test.rb                   | 143 +++++++--------------
 test/models_test.rb                                |  21 ++-
 .../app/active_record/user_without_email.rb        |   8 ++
 test/rails_app/app/mongoid/user_without_email.rb   |  33 +++++
 test/rails_app/config/routes.rb                    |   5 +
 test/rails_app/lib/shared_user_without_email.rb    |  26 ++++
 test/support/helpers.rb                            |   4 +
 52 files changed, 587 insertions(+), 250 deletions(-)

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