[DRE-commits] [ruby-devise] branch master updated (f5d9426 -> 7551b83)
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Feb 23 14:56:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a change to branch master
in repository ruby-devise.
from f5d9426 copy rules from ruby-responders
adds 7d879e0 Imported Upstream version 3.5.6
new 6d388c1 Merge tag 'upstream/3.5.6'
new a86d6db update changelog
new 2765fc4 upload to experimental
new 0d818fa add tag to patch
new ab0f7a8 switch vcs browser to https
new 7551b83 bump compat
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 +
debian/changelog | 9 ++
debian/compat | 2 +-
debian/control | 8 +-
debian/patches/locales.patch | 3 +
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 ++
.../{user_on_engine.rb => user_without_email.rb} | 12 +-
test/rails_app/config/routes.rb | 5 +
test/rails_app/lib/shared_user_without_email.rb | 26 ++++
test/support/helpers.rb | 4 +
56 files changed, 574 insertions(+), 264 deletions(-)
create mode 100644 CODE_OF_CONDUCT.md
create mode 100644 app/views/devise/mailer/password_change.html.erb
create mode 100644 lib/generators/templates/markerb/password_change.markerb
create mode 100644 test/controllers/helper_methods_test.rb
create mode 100644 test/rails_app/app/active_record/user_without_email.rb
copy test/rails_app/app/mongoid/{user_on_engine.rb => user_without_email.rb} (73%)
create mode 100644 test/rails_app/lib/shared_user_without_email.rb
--
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