diff --git a/Gemfile b/Gemfile
index 7f7da2f61..4f8b46de3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'json',        '1.8.0'
 
 # Authentication
 
-gem 'devise', '2.2.4'
+gem 'devise', '3.0.2'
 
 # Background processing
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ad5fea5a..9ce8f3b21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,11 +91,11 @@ GEM
       nokogiri (>= 1.5.0)
       rails (~> 3.0)
     database_cleaner (1.1.0)
-    devise (2.2.4)
+    devise (3.0.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     ethon (0.5.12)
@@ -440,7 +440,7 @@ DEPENDENCIES
   configurate (= 0.0.8)
   cucumber-rails (= 1.3.1)
   database_cleaner (= 1.1.0)
-  devise (= 2.2.4)
+  devise (= 3.0.2)
   factory_girl_rails (= 4.2.1)
   faraday (= 0.8.8)
   faraday_middleware (= 0.9.0)