Skip to content

Commit af19efb

Browse files
author
Tod Beardsley
committed
Use the new bcrypt gem, not bcrypt-ruby
See the change upstream at: bcrypt-ruby/bcrypt-ruby@273946f Reported by @zerochaos
1 parent 32293df commit af19efb

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
# Need 3+ for ActiveSupport::Concern
44
gem 'activesupport', '>= 3.0.0'
55
# Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
6-
gem 'bcrypt-ruby'
6+
gem 'bcrypt'
77
# Needed for some admin modules (scrutinizer_add_user.rb)
88
gem 'json'
99
# Needed by msfgui and other rpc components

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GEM
1313
i18n (~> 0.6, >= 0.6.4)
1414
multi_json (~> 1.0)
1515
arel (3.0.2)
16-
bcrypt-ruby (3.1.2)
16+
bcrypt (3.1.7)
1717
builder (3.0.4)
1818
database_cleaner (1.1.1)
1919
diff-lcs (1.2.4)
@@ -63,7 +63,7 @@ PLATFORMS
6363
DEPENDENCIES
6464
activerecord
6565
activesupport (>= 3.0.0)
66-
bcrypt-ruby
66+
bcrypt
6767
database_cleaner
6868
factory_girl (>= 4.1.0)
6969
fivemat (= 1.2.1)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Files: arel
176176
Copyright: 2007-2010 Nick Kallen, Bryan Helmkamp, Emilio Tagua, Aaron Patterson
177177
License: MIT
178178

179-
Files: bcrypt-ruby
179+
Files: bcrypt
180180
Copyright: 2007-2011 Coda Hale
181181
License: MIT
182182

0 commit comments

Comments
 (0)