team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed bcrypt-ruby to bcrypt gem (name change; remove warning); Rebuilt Gemfile.lock file

Browse Source
This commit is contained in:
Al Snow
2014-04-18 16:19:42 -04:00
parent 4af22d952d
commit 65a0f3e188
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+1 -1
View File
@@ -60,7 +60,7 @@ end
gem 'jquery-rails' gem 'jquery-rails'
# To use ActiveModel has_secure_password # To use ActiveModel has_secure_password
gem 'bcrypt-ruby' gem 'bcrypt'
# To use Jbuilder templates for JSON # To use Jbuilder templates for JSON
# gem 'jbuilder' # gem 'jbuilder'
Gemfile.lock
+2 -4
View File
@@ -35,8 +35,6 @@ GEM
cucumber (>= 1.1.1) cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0) rspec-expectations (>= 2.7.0)
bcrypt (3.1.7) bcrypt (3.1.7)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
better_errors (1.1.0) better_errors (1.1.0)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
@@ -213,7 +211,7 @@ GEM
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
raindrops (0.13.0) raindrops (0.13.0)
rake (10.3.0) rake (10.3.1)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.3) rb-inotify (0.9.3)
ffi (>= 0.5.0) ffi (>= 0.5.0)
@@ -306,7 +304,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
aruba aruba
bcrypt-ruby bcrypt
better_errors better_errors
binding_of_caller binding_of_caller
brakeman brakeman