[DRE-commits] [ruby-devise-two-factor] 02/04: Merge tag 'upstream/3.0.0'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sat Jun 11 17:48:54 UTC 2016


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

praveen pushed a commit to branch master
in repository ruby-devise-two-factor.

commit 57a536181330d4ce640e06111882559a48b3db87
Merge: 1defa84 1532e57
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jun 11 22:59:13 2016 +0530

    Merge tag 'upstream/3.0.0'
    
    Upstream version 3.0.0
    
    # gpg: Signature made Saturday 11 June 2016 10:59:08 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>"

 .gitignore                                         |  82 ++++++++++----------
 .travis.yml                                        |   8 +-
 CHANGELOG.md                                       |  42 ++++++++++
 README.md                                          |  72 ++++++++++++-----
 UPGRADING.md                                       |  22 ++++++
 checksums.yaml.gz.sig                              | Bin 0 -> 512 bytes
 data.tar.gz.sig                                    | Bin 0 -> 512 bytes
 demo/.gitignore                                    |  16 ----
 demo/Gemfile                                       |  40 ----------
 demo/README.rdoc                                   |  28 -------
 demo/Rakefile                                      |   6 --
 demo/app/assets/images/.keep                       |   0
 demo/app/assets/javascripts/application.js         |  16 ----
 demo/app/assets/javascripts/home.js.coffee         |   3 -
 demo/app/assets/stylesheets/application.css        |  15 ----
 demo/app/assets/stylesheets/home.css.scss          |   3 -
 demo/app/controllers/application_controller.rb     |  13 ----
 demo/app/controllers/concerns/.keep                |   0
 demo/app/controllers/home_controller.rb            |   4 -
 demo/app/controllers/users_controller.rb           |  14 ----
 demo/app/helpers/application_helper.rb             |   2 -
 demo/app/helpers/home_helper.rb                    |   2 -
 demo/app/mailers/.keep                             |   0
 demo/app/models/.keep                              |   0
 demo/app/models/concerns/.keep                     |   0
 demo/app/models/user.rb                            |  10 ---
 demo/app/views/devise/confirmations/new.html.erb   |  12 ---
 .../mailer/confirmation_instructions.html.erb      |   5 --
 .../mailer/reset_password_instructions.html.erb    |   8 --
 .../devise/mailer/unlock_instructions.html.erb     |   7 --
 demo/app/views/devise/passwords/edit.html.erb      |  16 ----
 demo/app/views/devise/passwords/new.html.erb       |  12 ---
 demo/app/views/devise/registrations/edit.html.erb  |  29 -------
 demo/app/views/devise/registrations/new.html.erb   |  18 -----
 demo/app/views/devise/sessions/new.html.erb        |  20 -----
 demo/app/views/devise/shared/_links.erb            |  25 ------
 demo/app/views/devise/unlocks/new.html.erb         |  12 ---
 demo/app/views/home/index.html.erb                 |  20 -----
 demo/app/views/layouts/application.html.erb        |  14 ----
 demo/bin/bundle                                    |   3 -
 demo/bin/rails                                     |   4 -
 demo/bin/rake                                      |   4 -
 demo/config.ru                                     |   4 -
 demo/config/application.rb                         |  28 -------
 demo/config/boot.rb                                |   4 -
 demo/config/database.yml                           |  85 ---------------------
 demo/config/environment.rb                         |   5 --
 demo/config/environments/development.rb            |  37 ---------
 demo/config/environments/production.rb             |  83 --------------------
 demo/config/environments/test.rb                   |  39 ----------
 demo/config/initializers/backtrace_silencers.rb    |   7 --
 demo/config/initializers/cookies_serializer.rb     |   3 -
 demo/config/initializers/devise.rb                 |  18 -----
 .../initializers/filter_parameter_logging.rb       |   4 -
 demo/config/initializers/inflections.rb            |  16 ----
 demo/config/initializers/mime_types.rb             |   4 -
 demo/config/initializers/session_store.rb          |   3 -
 demo/config/initializers/wrap_parameters.rb        |  14 ----
 demo/config/locales/devise.en.yml                  |  59 --------------
 demo/config/locales/en.yml                         |  23 ------
 demo/config/routes.rb                              |   9 ---
 demo/config/secrets.yml                            |  22 ------
 .../migrate/20140515190128_devise_create_users.rb  |  42 ----------
 ...0140516191259_add_devise_two_factor_to_users.rb |   9 ---
 demo/db/schema.rb                                  |  42 ----------
 demo/db/seeds.rb                                   |   7 --
 demo/lib/assets/.keep                              |   0
 demo/lib/tasks/.keep                               |   0
 demo/log/.keep                                     |   0
 demo/public/404.html                               |  67 ----------------
 demo/public/422.html                               |  67 ----------------
 demo/public/500.html                               |  66 ----------------
 demo/public/favicon.ico                            |   0
 demo/public/robots.txt                             |   5 --
 demo/test/controllers/.keep                        |   0
 demo/test/controllers/home_controller_test.rb      |   9 ---
 demo/test/fixtures/.keep                           |   0
 demo/test/fixtures/users.yml                       |  11 ---
 demo/test/helpers/.keep                            |   0
 demo/test/helpers/home_helper_test.rb              |   4 -
 demo/test/integration/.keep                        |   0
 demo/test/mailers/.keep                            |   0
 demo/test/models/.keep                             |   0
 demo/test/models/user_test.rb                      |   7 --
 demo/test/test_helper.rb                           |  13 ----
 demo/vendor/assets/javascripts/.keep               |   0
 demo/vendor/assets/stylesheets/.keep               |   0
 devise-two-factor.gemspec                          |   6 +-
 lib/devise-two-factor.rb                           |   2 +-
 .../models/two_factor_authenticatable.rb           |  13 +++-
 .../two_factor_authenticatable_shared_examples.rb  |   9 ++-
 lib/devise_two_factor/version.rb                   |   2 +-
 metadata.gz.sig                                    | Bin 0 -> 512 bytes
 .../models/two_factor_authenticatable_spec.rb      |  57 +++++++++++++-
 spec/devise/models/two_factor_backupable_spec.rb   |   6 +-
 95 files changed, 244 insertions(+), 1274 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list