Merge pull request #283 from cwoodcox/facebook

Upgrade to devise 1.5.x

Gemfile

@@ -7,7 +7,7 @@ gem 'rake', '0.9.2'
 gem 'rails', '3.0.10'
 
 gem 'warden'
-gem 'devise', '1.3.4'
+gem 'devise', '~>1.5.0'
 gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_authenticatable'
 
 gem 'mongo', '~> 1.3.1'

Gemfile.lock

@@ -41,7 +41,7 @@ GEM
     arel (2.0.10)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (3.0.1)
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (2.1.2)
@@ -89,10 +89,10 @@ GEM
     delayed_job_mongoid (1.0.8)
       delayed_job (~> 3.0.0)
       mongoid (>= 2.0)
-    devise (1.3.4)
-      bcrypt-ruby (~> 2.1.2)
+    devise (1.5.3)
+      bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
+      warden (~> 1.1)
     devise_bushido_authenticatable (1.0.0.alpha10)
       devise
       devise (>= 1.0.6)
@@ -179,7 +179,7 @@ GEM
     net-ssh (2.2.2)
     nokogiri (1.5.0)
     open4 (1.3.0)
-    orm_adapter (0.0.5)
+    orm_adapter (0.0.6)
     pickle (0.4.10)
       cucumber (>= 0.8)
       rake
@@ -270,7 +270,7 @@ GEM
       kgio (~> 2.4)
       rack
       raindrops (~> 0.6)
-    warden (1.0.6)
+    warden (1.1.0)
       rack (>= 1.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -298,7 +298,7 @@ DEPENDENCIES
   custom_fields (= 1.0.0.beta.25)
   database_cleaner
   delayed_job_mongoid (= 1.0.8)
-  devise (= 1.3.4)
+  devise (~> 1.5.0)
   devise_bushido_authenticatable (= 1.0.0.alpha10)
   dragonfly (~> 0.9.1)
   factory_girl_rails (~> 1.3.0)

locomotive_cms.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rails', '~> 3.0.10'
   s.add_dependency 'warden'
-  s.add_dependency 'devise', '1.3.4'
+  s.add_dependency 'devise', '~>1.5.0'
   s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10'
 
   s.add_dependency 'mongo', '~> 1.3.1'