depending on bcrypt gem (not bcrypt-ruby)

Conflicts: gemfiles/Gemfile.rails-4.1-stable
ysbaddaden · Aug 27, 2014 · 0fba1d7 · 0fba1d7
1 parent 5b5a7e7
commit 0fba1d7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gem 'addressable'
 group :test do
   gem 'rails', '4.1.5'
   gem 'sqlite3'
-  gem 'bcrypt-ruby'
+  gem 'bcrypt'
   gem 'scrypt'
   gem 'janus', :path => '.'
   gem 'minitest', :require => 'minitest/autorun'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -36,8 +36,6 @@ GEM
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
     bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     builder (3.2.2)
     capybara (2.4.1)
       mime-types (>= 1.16)
@@ -111,7 +109,7 @@ PLATFORMS
 
 DEPENDENCIES
   addressable
-  bcrypt-ruby
+  bcrypt
   capybara
   janus!
   minitest

diff --git a/gemfiles/Gemfile.rails-3.2-stable b/gemfiles/Gemfile.rails-3.2-stable
@@ -4,7 +4,7 @@ gem 'rails', :github => 'rails/rails', :branch => '3-2-stable'
 gem 'sqlite3'
 gem 'addressable'
 gem 'janus', :path => '..'
-gem 'bcrypt-ruby'
+gem 'bcrypt'
 gem 'scrypt'
 
 group :test do

diff --git a/gemfiles/Gemfile.rails-4.0-stable b/gemfiles/Gemfile.rails-4.0-stable
@@ -4,7 +4,7 @@ gem 'rails', :github => 'rails/rails', :branch => '4-0-stable'
 gem 'sqlite3'
 gem 'addressable'
 gem 'janus', :path => '..'
-gem 'bcrypt-ruby'
+gem 'bcrypt'
 gem 'scrypt'
 
 group :test do

diff --git a/gemfiles/Gemfile.rails-head b/gemfiles/Gemfile.rails-head
@@ -4,7 +4,7 @@ gem 'rails', github: 'rails/rails'
 gem 'sqlite3'
 gem 'addressable'
 gem 'janus', :path => '..'
-gem 'bcrypt-ruby'
+gem 'bcrypt'
 gem 'scrypt'
 
 group :test do

diff --git a/janus.gemspec b/janus.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rails', '>= 3.0.0'
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'bcrypt-ruby'
+  gem.add_development_dependency 'bcrypt'
   gem.add_development_dependency 'scrypt'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'capybara'