[DRE-commits] [ruby-devise-two-factor] 01/03: Merge tag 'upstream/2.0.0'

[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-two-factor.

commit 6aa11b794932b4601570249182145c5239f1a7ff
Merge: 34248bb 7c15f95
Author: Balasankar C <balasankarc at autistici.org>
Date:   Thu Sep 17 23:35:02 2015 +0530

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0

 UPGRADING.md                                       | 11 +++++
 ...0140516191259_add_devise_two_factor_to_users.rb |  1 +
 demo/db/schema.rb                                  |  1 +
 devise-two-factor.gemspec                          |  2 +-
 .../models/two_factor_authenticatable.rb           | 26 +++++++++--
 .../two_factor_authenticatable_shared_examples.rb  | 50 ++++++++++++++++------
 .../two_factor_backupable_shared_examples.rb       | 21 +++++----
 .../strategies/two_factor_authenticatable.rb       |  2 +-
 lib/devise_two_factor/version.rb                   |  2 +-
 .../devise_two_factor_generator.rb                 |  1 +
 .../models/two_factor_authenticatable_spec.rb      |  7 +++
 11 files changed, 94 insertions(+), 30 deletions(-)

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