From 5654d5921f3d06435da088398004f84a604c86f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 1 Jun 2014 13:20:06 +0200
Subject: [PATCH] bump devise

---
 Gemfile      |  2 +-
 Gemfile.lock | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9e07539e0..6bd20d194 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'json',        '1.8.1'
 
 # Authentication
 
-gem 'devise', '3.2.2'
+gem 'devise', '3.2.4'
 gem 'devise_lastseenable', '0.0.4'
 
 # Captcha
diff --git a/Gemfile.lock b/Gemfile.lock
index 1bb135d4a..5287a48b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,6 @@ GEM
     asset_sync (1.0.0)
       activemodel
       fog (>= 1.8.0)
-    atomic (1.1.14)
     backbone-on-rails (1.1.1.0)
       actionmailer
       actionpack
@@ -51,7 +50,7 @@ GEM
       ejs
       jquery-rails
       railties
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.7)
     bootstrap-sass (2.2.2.0)
       sass (~> 3.2)
     builder (3.0.4)
@@ -103,8 +102,8 @@ GEM
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
     database_cleaner (1.3.0)
-    devise (3.2.2)
-      bcrypt-ruby (~> 3.0)
+    devise (3.2.4)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
@@ -421,8 +420,7 @@ GEM
     systemu (2.5.2)
     test_after_commit (0.2.2)
     thor (0.19.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.1)
     timers (1.1.0)
@@ -447,6 +445,7 @@ GEM
       macaddr (~> 1.0)
       rack (>= 1.0)
     warden (1.2.3)
+      rack (>= 1.0)
     webmock (1.16.1)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -474,7 +473,7 @@ DEPENDENCIES
   configurate (= 0.0.8)
   cucumber-rails (= 1.4.1)
   database_cleaner (= 1.3.0)
-  devise (= 3.2.2)
+  devise (= 3.2.4)
   devise_lastseenable (= 0.0.4)
   entypo-rails
   factory_girl_rails (= 4.3.0)