Merge pull request lynndylanhurley#499 from djsegal/master

Allow new devise version for rails 5 compatibility
Jylth · Jan 19, 2016 · 8a6ba64 · 8a6ba64
2 parents c6d7062 + b20826d
commit 8a6ba64
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -35,7 +35,7 @@ PATH
   remote: .
   specs:
     devise_token_auth (0.1.37.beta4)
-      devise (~> 3.5.2)
+      devise (> 3.5.2, < 4.1)
       rails (< 6)
 
 GEM
@@ -211,8 +211,8 @@ GEM
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.1.1)
+      railties (>= 4.2.0, < 5.1)
     ruby-progressbar (1.7.5)
     shellany (0.0.1)
     simplecov (0.10.0)
@@ -224,10 +224,10 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)

diff --git a/devise_token_auth.gemspec b/devise_token_auth.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files.reject! { |file| file.match(/[.log|.sqlite3]$/) }
 
   s.add_dependency "rails", "< 6"
-  s.add_dependency "devise", "~> 3.5.2"
+  s.add_dependency "devise", "> 3.5.2", "< 4.1"
 
   s.add_development_dependency "sqlite3", "~> 1.3"
   s.add_development_dependency 'pg'