[DRE-commits] [ruby-devise] 01/03: Merge tag 'upstream/3.5.2'

[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 e2414e0cfc0934759364d2fc382102e47c293945
Merge: cca5767 a15297d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Oct 28 19:14:50 2015 +0530

    Merge tag 'upstream/3.5.2'
    
    Upstream version 3.5.2
    
    # gpg: Signature made Wednesday 28 October 2015 07:14:43 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>"

 CHANGELOG.md                                       |  10 ++
 Gemfile                                            |   4 +-
 Gemfile.lock                                       | 114 ++++++++++-----------
 README.md                                          |   7 +-
 app/controllers/devise/passwords_controller.rb     |   5 +-
 app/views/devise/passwords/edit.html.erb           |   4 +-
 devise.gemspec                                     |   2 -
 lib/devise.rb                                      |   7 +-
 lib/devise/controllers/sign_in_out.rb              |   8 +-
 lib/devise/failure_app.rb                          |   9 +-
 lib/devise/hooks/timeoutable.rb                    |   4 -
 lib/devise/models/confirmable.rb                   |  29 ++++--
 lib/devise/models/database_authenticatable.rb      |   1 -
 lib/devise/rails/routes.rb                         |  21 ++--
 lib/devise/strategies/authenticatable.rb           |   2 +-
 lib/devise/version.rb                              |   2 +-
 lib/generators/templates/controllers/README        |   2 +-
 lib/generators/templates/devise.rb                 |   3 -
 metadata.yml                                       |  46 ++++-----
 test/devise_test.rb                                |   2 +-
 test/integration/timeoutable_test.rb               |  17 ---
 test/mailers/confirmation_instructions_test.rb     |   2 +-
 test/models/confirmable_test.rb                    |  15 ++-
 .../rails_app/app/controllers/admins_controller.rb |   5 -
 test/rails_app/config/routes.rb                    |   4 +-
 25 files changed, 153 insertions(+), 172 deletions(-)

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