Allow Devise to update to 3.x

amomusik · Aug 29, 2013 · 56140b0 · 56140b0
1 parent d1e6d0f
commit 56140b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '2.0.0'
 gem 'rails', '3.2.14'
-gem 'devise', '~> 2.2.3'
+gem 'devise'
 gem 'thin'
 gem 'jquery-rails'
 gem 'nested_form'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -73,11 +73,11 @@ GEM
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     daemons (1.1.9)
-    devise (2.2.7)
+    devise (3.0.3)
       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)
     eco (1.0.0)
       coffee-script
@@ -311,7 +311,7 @@ DEPENDENCIES
   capybara-screenshot
   coffee-rails
   compass-rails
-  devise (~> 2.2.3)
+  devise
   factory_girl_rails
   faker
   font-awesome-rails