[DRE-commits] [ruby-devise] 26/43: Merge tag 'upstream/3.2.4'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Apr 21 13:11:11 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 34e96c10b86f7991536954f3726dfb000e25fc35
Merge: 430d564 4045f3b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Apr 24 16:28:10 2014 +0530
Merge tag 'upstream/3.2.4'
Upstream version 3.2.4
Conflicts:
.gitignore
.gitignore | 2 +-
.travis.yml | 31 +-
.yardopts | 9 +
CHANGELOG.rdoc => CHANGELOG.md | 405 ++++++++++++------
CONTRIBUTING.md | 4 +-
Gemfile | 16 +-
Gemfile.lock | 215 +++++-----
MIT-LICENSE | 2 +-
README.md | 272 +++++++++----
Rakefile | 3 +-
app/controllers/devise/confirmations_controller.rb | 20 +-
.../devise/omniauth_callbacks_controller.rb | 4 +-
app/controllers/devise/passwords_controller.rb | 19 +-
app/controllers/devise/registrations_controller.rb | 54 ++-
app/controllers/devise/sessions_controller.rb | 29 +-
app/controllers/devise/unlocks_controller.rb | 14 +-
app/controllers/devise_controller.rb | 54 ++-
app/helpers/devise_helper.rb | 4 +-
app/mailers/devise/mailer.rb | 25 +-
app/views/devise/_links.erb | 3 -
app/views/devise/confirmations/new.html.erb | 4 +-
.../mailer/confirmation_instructions.html.erb | 4 +-
.../mailer/reset_password_instructions.html.erb | 4 +-
.../devise/mailer/unlock_instructions.html.erb | 2 +-
app/views/devise/passwords/edit.html.erb | 6 +-
app/views/devise/passwords/new.html.erb | 4 +-
app/views/devise/registrations/edit.html.erb | 16 +-
app/views/devise/registrations/new.html.erb | 8 +-
app/views/devise/sessions/new.html.erb | 6 +-
app/views/devise/shared/_links.erb | 4 +-
app/views/devise/unlocks/new.html.erb | 4 +-
checksums.yaml.gz | Bin 0 -> 269 bytes
config/locales/en.yml | 96 ++---
devise.gemspec | 10 +-
devise.png | Bin 0 -> 13322 bytes
gemfiles/Gemfile.rails-3.1.x | 35 --
gemfiles/Gemfile.rails-3.1.x.lock | 167 --------
Gemfile => gemfiles/Gemfile.rails-3.2-stable | 18 +-
Gemfile => gemfiles/Gemfile.rails-4.0-stable | 18 +-
Gemfile => gemfiles/Gemfile.rails-head | 18 +-
lib/devise.rb | 109 +++--
lib/devise/controllers/helpers.rb | 138 ++-----
lib/devise/controllers/rememberable.rb | 31 +-
lib/devise/controllers/scoped_views.rb | 2 +-
lib/devise/controllers/sign_in_out.rb | 103 +++++
lib/devise/controllers/store_location.rb | 50 +++
lib/devise/failure_app.rb | 32 +-
lib/devise/hooks/activatable.rb | 8 +-
lib/devise/hooks/csrf_cleaner.rb | 5 +
lib/devise/hooks/forgetable.rb | 2 +-
lib/devise/hooks/lockable.rb | 4 +-
lib/devise/hooks/proxy.rb | 21 +
lib/devise/hooks/rememberable.rb | 9 +-
lib/devise/hooks/timeoutable.rb | 7 +-
lib/devise/hooks/trackable.rb | 2 +-
lib/devise/mailers/helpers.rb | 41 +-
lib/devise/mapping.rb | 12 +-
lib/devise/models.rb | 15 +-
lib/devise/models/authenticatable.rb | 96 +++--
lib/devise/models/confirmable.rb | 119 +++---
lib/devise/models/database_authenticatable.rb | 43 +-
lib/devise/models/lockable.rb | 55 +--
lib/devise/models/omniauthable.rb | 6 +-
lib/devise/models/recoverable.rb | 49 +--
lib/devise/models/rememberable.rb | 14 +-
lib/devise/models/timeoutable.rb | 6 +-
lib/devise/models/token_authenticatable.rb | 89 ----
lib/devise/models/trackable.rb | 2 +-
lib/devise/models/validatable.rb | 12 +-
lib/devise/modules.rb | 21 +-
lib/devise/omniauth/url_helpers.rb | 4 +-
lib/devise/orm/active_record.rb | 2 +-
lib/devise/orm/mongoid.rb | 2 +-
.../{param_filter.rb => parameter_filter.rb} | 21 +-
lib/devise/parameter_sanitizer.rb | 99 +++++
lib/devise/rails.rb | 24 +-
lib/devise/rails/routes.rb | 258 +++++++-----
lib/devise/rails/warden_compat.rb | 41 +-
lib/devise/strategies/authenticatable.rb | 33 +-
lib/devise/strategies/base.rb | 2 +-
lib/devise/strategies/database_authenticatable.rb | 11 +-
lib/devise/strategies/rememberable.rb | 4 +-
lib/devise/strategies/token_authenticatable.rb | 56 ---
lib/devise/test_helpers.rb | 5 +-
lib/devise/time_inflector.rb | 4 +-
lib/devise/token_generator.rb | 70 ++++
lib/devise/version.rb | 2 +-
lib/generators/active_record/devise_generator.rb | 24 +-
.../active_record/templates/migration.rb | 9 +-
.../active_record/templates/migration_existing.rb | 9 +-
lib/generators/devise/devise_generator.rb | 8 +-
lib/generators/devise/install_generator.rb | 5 +
lib/generators/devise/orm_helpers.rb | 31 +-
lib/generators/devise/views_generator.rb | 59 ++-
lib/generators/mongoid/devise_generator.rb | 46 +--
lib/generators/templates/README | 10 +-
lib/generators/templates/devise.rb | 80 ++--
.../markerb/confirmation_instructions.markerb | 4 +-
.../markerb/reset_password_instructions.markerb | 2 +-
.../templates/markerb/unlock_instructions.markerb | 2 +-
.../simple_form_for/confirmations/new.html.erb | 5 +-
.../simple_form_for/passwords/edit.html.erb | 8 +-
.../simple_form_for/passwords/new.html.erb | 4 +-
.../simple_form_for/registrations/edit.html.erb | 17 +-
.../simple_form_for/registrations/new.html.erb | 8 +-
.../simple_form_for/sessions/new.html.erb | 8 +-
.../templates/simple_form_for/unlocks/new.html.erb | 5 +-
metadata.yml | 452 +++++++++++++++++++++
test/controllers/helpers_test.rb | 87 ++--
test/controllers/internal_helpers_test.rb | 33 +-
test/controllers/passwords_controller_test.rb | 31 ++
test/controllers/sessions_controller_test.rb | 48 ++-
test/controllers/url_helpers_test.rb | 8 +-
test/delegator_test.rb | 2 +-
test/devise_test.rb | 32 +-
test/failure_app_test.rb | 57 +--
test/generators/active_record_generator_test.rb | 44 +-
test/generators/devise_generator_test.rb | 4 +-
test/generators/mongoid_generator_test.rb | 6 +-
test/generators/views_generator_test.rb | 48 ++-
test/helpers/devise_helper_test.rb | 24 +-
test/integration/authenticatable_test.rb | 202 ++++++---
test/integration/confirmable_test.rb | 162 ++++----
test/integration/database_authenticatable_test.rb | 42 +-
test/integration/http_authenticatable_test.rb | 48 ++-
test/integration/lockable_test.rb | 99 +++--
test/integration/omniauthable_test.rb | 10 +-
test/integration/recoverable_test.rb | 144 +++----
test/integration/registerable_test.rb | 146 +++----
test/integration/rememberable_test.rb | 67 +--
test/integration/timeoutable_test.rb | 71 +++-
test/integration/token_authenticatable_test.rb | 161 --------
test/integration/trackable_test.rb | 6 +-
test/mailers/confirmation_instructions_test.rb | 29 +-
test/mailers/reset_password_instructions_test.rb | 27 +-
test/mailers/unlock_instructions_test.rb | 24 +-
test/mapping_test.rb | 10 +-
test/models/authenticatable_test.rb | 8 +-
test/models/confirmable_test.rb | 145 +++++--
test/models/database_authenticatable_test.rb | 151 ++++---
test/models/lockable_test.rb | 115 ++++--
test/models/recoverable_test.rb | 73 ++--
test/models/rememberable_test.rb | 31 +-
test/models/serializable_test.rb | 23 +-
test/models/timeoutable_test.rb | 7 +-
test/models/token_authenticatable_test.rb | 55 ---
test/models/validatable_test.rb | 42 +-
test/models_test.rb | 49 +--
test/omniauth/config_test.rb | 8 +-
test/omniauth/url_helpers_test.rb | 11 +-
test/orm/active_record.rb | 1 +
test/orm/mongoid.rb | 5 +-
test/parameter_sanitizer_test.rb | 81 ++++
test/rails_app/Rakefile | 4 -
test/rails_app/app/active_record/shim.rb | 2 +-
.../app/controllers/admins/sessions_controller.rb | 2 +-
.../rails_app/app/controllers/admins_controller.rb | 2 +-
.../app/controllers/application_controller.rb | 5 +-
test/rails_app/app/controllers/home_controller.rb | 2 +-
.../publisher/registrations_controller.rb | 2 +-
.../controllers/publisher/sessions_controller.rb | 2 +-
.../users/omniauth_callbacks_controller.rb | 6 +-
test/rails_app/app/controllers/users_controller.rb | 16 +-
test/rails_app/app/mailers/users/mailer.rb | 12 +-
test/rails_app/app/mongoid/admin.rb | 22 +-
test/rails_app/app/mongoid/shim.rb | 9 +-
test/rails_app/app/mongoid/user.rb | 41 +-
.../app/views/admins/sessions/new.html.erb | 2 +-
.../app/views/home/admin_dashboard.html.erb | 2 +-
test/rails_app/app/views/home/index.html.erb | 2 +-
test/rails_app/app/views/home/join.html.erb | 2 +-
.../app/views/home/user_dashboard.html.erb | 2 +-
.../app/views/layouts/application.html.erb | 2 +-
test/rails_app/app/views/users/edit_form.html.erb | 1 +
test/rails_app/bin/bundle | 3 +
test/rails_app/bin/rails | 4 +
test/rails_app/bin/rake | 4 +
test/rails_app/config/application.rb | 7 +-
test/rails_app/config/boot.rb | 12 +-
test/rails_app/config/environment.rb | 4 +-
test/rails_app/config/environments/development.rb | 26 +-
test/rails_app/config/environments/production.rb | 81 +++-
test/rails_app/config/environments/test.rb | 33 +-
test/rails_app/config/initializers/devise.rb | 13 +-
test/rails_app/config/initializers/secret_token.rb | 10 +-
.../rails_app/config/initializers/session_store.rb | 1 +
test/rails_app/config/routes.rb | 95 +++--
.../db/migrate/20100401102949_create_tables.rb | 17 +-
test/rails_app/db/schema.rb | 39 +-
test/rails_app/lib/shared_admin.rb | 11 +-
test/rails_app/lib/shared_user.rb | 7 +-
test/rails_app/script/rails | 10 -
test/routes_test.rb | 170 ++++----
.../support/action_controller/record_identifier.rb | 10 +
test/support/helpers.rb | 31 +-
test/support/integration.rb | 24 +-
test/support/locale/en.yml | 4 +
test/support/mongoid.yml | 6 +
test/test_helper.rb | 2 +-
test/test_helpers_test.rb | 28 +-
test/test_models.rb | 33 ++
201 files changed, 4451 insertions(+), 2997 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