From 56d771a9f498de2d98f05f84e170ae65ef084b30 Mon Sep 17 00:00:00 2001
From: Carlos Puchol <cpg+git@amahi.org>
Date: Wed, 4 Mar 2015 22:33:09 -0800
Subject: [PATCH] rename bcrypt, to eliminate the warning that they changed the
 gem name

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5cec312..5131ac9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem "dynamic_form"
 
 gem "exception_notification"
 
-gem "bcrypt-ruby", "~> 3.1.2"
+gem "bcrypt", "~> 3.1.2"
 
 gem "nokogiri", "= 1.6.1"
 gem "htmlentities"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0122207..d366220 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,8 +29,6 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     builder (3.2.2)
     diff-lcs (1.2.5)
     dynamic_form (1.1.4)
@@ -135,7 +133,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby (~> 3.1.2)
+  bcrypt (~> 3.1.2)
   dynamic_form
   exception_notification
   faker