From 68fa46f745bd2a7aadecc9680e8ec2426ef39bc8 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@MacBook-Pro-de-Nicolas-2.local>
Date: Tue, 9 Dec 2014 01:03:53 +0100
Subject: [PATCH] bcrypt

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

diff --git a/Gemfile b/Gemfile
index 9a7e527..6852ae3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.0.12'
   
-gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'bcrypt-ruby', '3.1.2'
 # Use sqlite3 as the database for Active Record
 
 gem 'mysql2'
diff --git a/Gemfile.lock b/Gemfile.lock
index f8861c3..34cf55a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,7 +30,7 @@ GEM
       activerecord (>= 3.0.0)
     arel (4.0.2)
     bcrypt (3.1.9)
-    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.1.2)
     builder (3.1.4)
     cancan (1.6.10)
     capistrano (2.15.5)
@@ -199,7 +199,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_commentable
   acts_as_tree
-  bcrypt-ruby (~> 3.0.0)
+  bcrypt-ruby (= 3.1.2)
   cancan
   capistrano
   carrierwave (= 0.9.0)