Skip to content

Move two_factor_authentication gem to upstream version #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
monfresh merged 1 commit into from
Jun 16, 2016
Merged

Move two_factor_authentication gem to upstream version #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ gem 'sinatra', require: false
gem 'slim-rails'
gem 'turbolinks'
gem 'twilio-ruby'
gem 'two_factor_authentication', github: 'sbc100/two_factor_authentication', branch: 'direct_codes'
gem 'two_factor_authentication', github: 'Houdini/two_factor_authentication'
gem 'uglifier', '>= 1.3.0'
gem 'whenever', require: false
gem 'xmlenc', '~> 0.6.4'
Expand Down
21 changes: 10 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
GIT
remote: https://github.com/monfresh/sms-spec.git
revision: 786238c1924c055d16a4963abb329c9b985ce104
specs:
sms-spec (0.2.0)
rspec (~> 3.1)

GIT
remote: https://github.com/sbc100/two_factor_authentication.git
revision: 06c67df575d99fd51a62427d696d6e1211d4b7b5
branch: direct_codes
remote: https://github.com/Houdini/two_factor_authentication.git
revision: 9d7d3472f4d272f70c2357ca4bced6f32ec2fbc9
specs:
two_factor_authentication (1.1.5)
devise
Expand All @@ -17,6 +9,13 @@ GIT
randexp
rotp

GIT
remote: https://github.com/monfresh/sms-spec.git
revision: 786238c1924c055d16a4963abb329c9b985ce104
specs:
sms-spec (0.2.0)
rspec (~> 3.1)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -331,7 +330,7 @@ GEM
redis (3.3.0)
responders (2.2.0)
railties (>= 4.2.0, < 5.1)
rotp (3.0.1)
rotp (3.1.0)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
Expand Down