[DRE-commits] [ruby-devise] 35/43: Merge tag 'upstream/3.4.1'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Apr 21 13:11:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-devise.
commit 2aab869f9a4f6078653fa79f18e3b24b9a4f1865
Merge: f650e70 4d76327
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Wed Jan 14 12:05:34 2015 +0530
Merge tag 'upstream/3.4.1'
Upstream version 3.4.1
# gpg: Signature made Wednesday 14 January 2015 12:05:28 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>"
.gitignore | 1 -
.travis.yml | 19 +-
CHANGELOG.md | 57 +++++-
Gemfile | 8 +-
Gemfile.lock | 220 ++++++++++++---------
README.md | 77 +++++---
app/controllers/devise/confirmations_controller.rb | 4 +-
app/controllers/devise/registrations_controller.rb | 23 ++-
app/controllers/devise/sessions_controller.rb | 41 +++-
app/controllers/devise_controller.rb | 19 +-
app/views/devise/confirmations/new.html.erb | 10 +-
app/views/devise/passwords/edit.html.erb | 16 +-
app/views/devise/passwords/new.html.erb | 10 +-
app/views/devise/registrations/edit.html.erb | 28 ++-
app/views/devise/registrations/new.html.erb | 25 ++-
app/views/devise/sessions/new.html.erb | 23 ++-
.../devise/shared/{_links.erb => _links.html.erb} | 2 +-
app/views/devise/unlocks/new.html.erb | 10 +-
checksums.yaml.gz | Bin 269 -> 0 bytes
config/locales/en.yml | 33 ++--
devise.gemspec | 2 +
gemfiles/Gemfile.rails-3.2-stable | 6 +-
gemfiles/Gemfile.rails-3.2-stable.lock | 169 ++++++++++++++++
gemfiles/Gemfile.rails-4.0-stable | 8 +-
gemfiles/Gemfile.rails-4.0-stable.lock | 165 ++++++++++++++++
...Gemfile.rails-head => Gemfile.rails-4.1-stable} | 10 +-
gemfiles/Gemfile.rails-4.1-stable.lock | 170 ++++++++++++++++
lib/devise.rb | 15 +-
lib/devise/controllers/helpers.rb | 83 +++++++-
lib/devise/controllers/sign_in_out.rb | 1 -
lib/devise/controllers/store_location.rb | 10 +-
lib/devise/controllers/url_helpers.rb | 4 +-
lib/devise/failure_app.rb | 21 +-
lib/devise/hooks/activatable.rb | 7 +-
lib/devise/hooks/csrf_cleaner.rb | 4 +-
lib/devise/hooks/timeoutable.rb | 9 +-
lib/devise/mapping.rb | 7 +-
lib/devise/models/authenticatable.rb | 10 +-
lib/devise/models/confirmable.rb | 6 +-
lib/devise/models/database_authenticatable.rb | 10 +-
lib/devise/models/lockable.rb | 8 +-
lib/devise/models/recoverable.rb | 30 ++-
lib/devise/models/rememberable.rb | 4 +-
lib/devise/models/trackable.rb | 5 +-
lib/devise/rails/routes.rb | 29 ++-
lib/devise/strategies/authenticatable.rb | 10 +-
lib/devise/strategies/database_authenticatable.rb | 1 +
lib/devise/strategies/rememberable.rb | 9 +-
lib/devise/version.rb | 2 +-
lib/generators/active_record/devise_generator.rb | 22 ++-
lib/generators/devise/controllers_generator.rb | 44 +++++
lib/generators/templates/README | 2 +-
lib/generators/templates/controllers/README | 14 ++
.../controllers/confirmations_controller.rb | 28 +++
.../controllers/omniauth_callbacks_controller.rb | 28 +++
.../templates/controllers/passwords_controller.rb | 32 +++
.../controllers/registrations_controller.rb | 60 ++++++
.../templates/controllers/sessions_controller.rb | 25 +++
.../templates/controllers/unlocks_controller.rb | 28 +++
lib/generators/templates/devise.rb | 7 +-
.../simple_form_for/registrations/new.html.erb | 2 +-
.../simple_form_for/sessions/new.html.erb | 4 +-
metadata.yml | 59 +++++-
script/cached-bundle | 49 +++++
script/s3-put | 71 +++++++
.../custom_registrations_controller_test.rb | 35 ++++
test/controllers/helpers_test.rb | 35 ++++
test/controllers/internal_helpers_test.rb | 8 +-
test/controllers/passwords_controller_test.rb | 2 +-
test/controllers/url_helpers_test.rb | 6 +
test/devise_test.rb | 23 ++-
test/failure_app_test.rb | 51 ++++-
test/generators/active_record_generator_test.rb | 6 +
test/generators/controllers_generator_test.rb | 48 +++++
test/generators/views_generator_test.rb | 2 +-
test/helpers/devise_helper_test.rb | 20 +-
test/integration/authenticatable_test.rb | 24 ++-
test/integration/confirmable_test.rb | 58 +++++-
test/integration/lockable_test.rb | 12 +-
test/integration/recoverable_test.rb | 10 +-
test/integration/registerable_test.rb | 54 ++---
test/integration/timeoutable_test.rb | 10 +-
test/integration/trackable_test.rb | 4 +-
test/mailers/confirmation_instructions_test.rb | 6 +-
test/mailers/reset_password_instructions_test.rb | 6 +-
test/mailers/unlock_instructions_test.rb | 6 +-
test/mapping_test.rb | 1 +
test/models/authenticatable_test.rb | 12 +-
test/models/confirmable_test.rb | 11 +-
test/models/lockable_test.rb | 32 ++-
test/models/recoverable_test.rb | 12 ++
test/models/rememberable_test.rb | 27 ++-
test/models/trackable_test.rb | 28 +++
test/models/validatable_test.rb | 4 +-
test/rails_app/app/active_record/user_on_engine.rb | 7 +
.../app/active_record/user_on_main_app.rb | 7 +
.../app/controllers/application_controller.rb | 3 +
.../controllers/application_with_fake_engine.rb | 30 +++
.../controllers/custom/registrations_controller.rb | 21 ++
.../users/omniauth_callbacks_controller.rb | 2 +-
test/rails_app/app/controllers/users_controller.rb | 2 +-
.../app/mailers/users/from_proc_mailer.rb | 3 +
test/rails_app/app/mailers/users/mailer.rb | 9 -
.../rails_app/app/mailers/users/reply_to_mailer.rb | 4 +
test/rails_app/app/mongoid/user_on_engine.rb | 39 ++++
test/rails_app/app/mongoid/user_on_main_app.rb | 39 ++++
test/rails_app/config/application.rb | 2 +-
test/rails_app/config/initializers/devise.rb | 2 +
test/rails_app/config/routes.rb | 17 ++
.../db/migrate/20100401102949_create_tables.rb | 4 +-
test/rails_app/lib/shared_user.rb | 2 +-
test/rails_app/lib/shared_user_without_omniauth.rb | 13 ++
test/routes_test.rb | 8 +-
test/support/assertions.rb | 5 +-
test/support/helpers.rb | 15 +-
test/support/integration.rb | 4 +-
test/test_helper.rb | 7 +
test/test_helpers_test.rb | 54 +++--
118 files changed, 2297 insertions(+), 471 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-devise.git
More information about the Pkg-ruby-extras-commits
mailing list