Skip to content
Permalink
Browse files

Merge pull request #339 from dradis/update-bcrypt-gem

Update bcrypt in Gemfile and Gemfile.lock
  • Loading branch information...
etdsoft committed Aug 15, 2018
2 parents a936540 + b915f33 commit d7b5dc4a3dd42f03460f513edab88bd5355f65bd
Showing with 3 additions and 3 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
@@ -69,7 +69,7 @@ gem 'thor', '~> 0.18'

# Use ActiveModel has_secure_password
# Password digests
gem 'bcrypt', '3.1.10'
gem 'bcrypt', '3.1.12'

# Required by Rails (uglifier and activesupport)
gem 'json', '1.8.6'
@@ -65,7 +65,7 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
arel (8.0.0)
ast (2.3.0)
bcrypt (3.1.10)
bcrypt (3.1.12)
bindex (0.5.0)
blankslate (3.1.3)
bootstrap-sass (2.3.2.2)
@@ -378,7 +378,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (= 4.3.1)
acts_as_tree (~> 2.7.1)
bcrypt (= 3.1.10)
bcrypt (= 3.1.12)
bootstrap-sass (~> 2.3.2.2)
brakeman
builder

0 comments on commit d7b5dc4

Please sign in to comment.
You can’t perform that action at this time.