[DRE-commits] [ruby-devise] 01/04: Merge tag 'upstream/3.5.1'

[Balasankar C]

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

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

commit 61c3ec08828f6696bea1b082f345d89ef0f0ab11
Merge: 15d8682 4ba0e60
Author: Balasankar C <balasankarc at autistici.org>
Date:   Sat Jul 11 10:55:16 2015 +0530

    Merge tag 'upstream/3.5.1'
    
    Upstream version 3.5.1

 .travis.yml                                        |  42 ++--
 CHANGELOG.md                                       | 235 ++++++++++++---------
 Gemfile                                            |   2 +-
 Gemfile.lock                                       | 169 ++++++++-------
 MIT-LICENSE                                        |   2 +-
 README.md                                          |  84 +++++---
 Rakefile                                           |   3 +-
 app/controllers/devise/confirmations_controller.rb |   4 +
 .../devise/omniauth_callbacks_controller.rb        |   4 +
 app/controllers/devise/passwords_controller.rb     |  18 +-
 app/controllers/devise/registrations_controller.rb |  21 +-
 app/controllers/devise/sessions_controller.rb      |   9 +-
 app/controllers/devise/unlocks_controller.rb       |   3 +
 app/controllers/devise_controller.rb               |  52 +++--
 app/views/devise/confirmations/new.html.erb        |   2 +-
 app/views/devise/passwords/edit.html.erb           |   3 +
 app/views/devise/registrations/new.html.erb        |   2 +-
 gemfiles/Gemfile.rails-3.2-stable.lock             |  86 ++++----
 gemfiles/Gemfile.rails-4.0-stable.lock             |  92 ++++----
 gemfiles/Gemfile.rails-4.1-stable.lock             | 105 +++++----
 Gemfile => gemfiles/Gemfile.rails-4.2-stable       |  10 +-
 gemfiles/Gemfile.rails-4.2-stable.lock             | 191 +++++++++++++++++
 lib/devise.rb                                      |  51 ++---
 lib/devise/controllers/rememberable.rb             |   2 +-
 lib/devise/controllers/sign_in_out.rb              |   2 +-
 lib/devise/controllers/store_location.rb           |   4 +-
 lib/devise/controllers/url_helpers.rb              |  16 +-
 lib/devise/encryptor.rb                            |  22 ++
 lib/devise/failure_app.rb                          |  36 +++-
 lib/devise/mapping.rb                              |   1 +
 lib/devise/models/authenticatable.rb               |  46 ++--
 lib/devise/models/confirmable.rb                   |  36 +++-
 lib/devise/models/database_authenticatable.rb      |  15 +-
 lib/devise/models/recoverable.rb                   |  32 ++-
 lib/devise/models/rememberable.rb                  |  19 +-
 lib/devise/models/trackable.rb                     |   3 +-
 lib/devise/models/validatable.rb                   |   6 +-
 lib/devise/rails.rb                                |   2 +-
 lib/devise/rails/routes.rb                         |   6 +-
 lib/devise/strategies/authenticatable.rb           |   7 +-
 lib/devise/strategies/database_authenticatable.rb  |   2 +-
 lib/devise/strategies/rememberable.rb              |  10 +
 lib/devise/test_helpers.rb                         |   4 +-
 lib/devise/version.rb                              |   2 +-
 .../active_record/templates/migration.rb           |   2 +-
 .../active_record/templates/migration_existing.rb  |   2 +-
 lib/generators/templates/controllers/README        |   2 +-
 .../controllers/omniauth_callbacks_controller.rb   |   2 +-
 .../controllers/registrations_controller.rb        |   4 +-
 .../templates/controllers/sessions_controller.rb   |   2 +-
 lib/generators/templates/devise.rb                 |  22 +-
 .../simple_form_for/passwords/edit.html.erb        |   2 +-
 .../simple_form_for/registrations/new.html.erb     |   2 +-
 metadata.yml                                       |  13 +-
 .../custom_registrations_controller_test.rb        |   7 +-
 test/controllers/helpers_test.rb                   |   5 +
 .../inherited_controller_i18n_messages_test.rb     |  51 +++++
 test/controllers/internal_helpers_test.rb          |   8 +-
 test/controllers/load_hooks_controller_test.rb     |  19 ++
 test/controllers/passwords_controller_test.rb      |   2 +-
 test/controllers/sessions_controller_test.rb       |   6 +-
 test/devise_test.rb                                |   4 +-
 test/failure_app_test.rb                           |  23 ++
 test/integration/database_authenticatable_test.rb  |  11 +
 test/integration/omniauthable_test.rb              |   2 +-
 test/integration/recoverable_test.rb               |  13 ++
 test/integration/rememberable_test.rb              |   9 +
 test/mapping_test.rb                               |   6 +
 test/models/confirmable_test.rb                    |  81 ++++---
 test/models/lockable_test.rb                       |  12 +-
 test/models/recoverable_test.rb                    |  46 +++-
 test/models/rememberable_test.rb                   |  10 +-
 test/models/validatable_test.rb                    |  10 +-
 .../controllers/custom/registrations_controller.rb |  10 +
 test/rails_app/config/application.rb               |   2 +-
 test/rails_app/config/environments/production.rb   |   8 +-
 test/rails_app/config/environments/test.rb         |   9 +-
 test/rails_app/config/initializers/devise.rb       |  27 ++-
 test/rails_app/lib/shared_user.rb                  |   2 +-
 test/rails_test.rb                                 |   9 +
 test/support/integration.rb                        |   4 +-
 test/test_helpers_test.rb                          |  29 ++-
 test/test_models.rb                                |   4 +-
 83 files changed, 1283 insertions(+), 662 deletions(-)

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