From 0a97a5672c7e3ded8f6b0a5dfdb30aa544d3cac0 Mon Sep 17 00:00:00 2001 From: joshua stein Date: Sat, 30 Jun 2012 14:23:08 -0500 Subject: [PATCH] use bcrypt 3.0.0 that is compiled on thalamus --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9b578a7..14c975a 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "mysql2" gem 'jquery-rails' # To use ActiveModel has_secure_password -gem 'bcrypt-ruby', '~> 3.0.0' +gem 'bcrypt-ruby', '3.0.0' gem "dynamic_form" diff --git a/Gemfile.lock b/Gemfile.lock index 86ba7e0..67bc660 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) - bcrypt-ruby (3.0.1) + bcrypt-ruby (3.0.0) builder (3.0.0) diff-lcs (1.1.3) dynamic_form (1.1.4) @@ -104,7 +104,7 @@ PLATFORMS ruby DEPENDENCIES - bcrypt-ruby (~> 3.0.0) + bcrypt-ruby (= 3.0.0) dynamic_form jquery-rails machinist