From a67d973785eae54ff80cc79b7560d89af3bc9130 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Mon, 20 Apr 2015 21:33:04 -0500 Subject: [PATCH] Freeze bcrypt and bcrypt-ruby version --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- gemfiles/rails-4.2.edge.gemfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 3cf8f540..7acf64bf 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,8 @@ gem 'coffee-rails', '~> 4.0.0' gem 'paperclip', '~> 4.2.0' gem 'rmagick', '2.13.4' gem 'aws-sdk', '~> 1.50' -gem 'bcrypt-ruby', '~> 3.0.1' -gem 'bcrypt' +gem 'bcrypt-ruby', '3.0.1' +gem 'bcrypt', '3.1.10' group :production do gem 'less-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 82cb0506..bafd7ea2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,8 +211,8 @@ PLATFORMS DEPENDENCIES aws-sdk (~> 1.50) - bcrypt - bcrypt-ruby (~> 3.0.1) + bcrypt (= 3.1.10) + bcrypt-ruby (= 3.0.1) bootplus-rails capybara coffee-rails (~> 4.0.0) diff --git a/gemfiles/rails-4.2.edge.gemfile b/gemfiles/rails-4.2.edge.gemfile index f31afb1e..143fcb21 100644 --- a/gemfiles/rails-4.2.edge.gemfile +++ b/gemfiles/rails-4.2.edge.gemfile @@ -7,8 +7,8 @@ gem 'coffee-rails', '~> 4.0.0' gem 'paperclip', '~> 4.2.0' gem 'rmagick', '2.13.4' gem 'aws-sdk', '~> 1.50' -gem 'bcrypt-ruby', '~> 3.0.1' -gem 'bcrypt' +gem 'bcrypt-ruby', '3.0.1' +gem 'bcrypt', '3.1.10' group :production do gem 'less-rails'