Skip to content

Commit

Permalink
Merge pull request #467 from djsegal/rails5
Browse files Browse the repository at this point in the history
Reduce dependencies to allow Rails 5.0
  • Loading branch information
booleanbetrayal committed Dec 14, 2015
2 parents 29fb929 + 8c15245 commit 66ff79f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PATH
specs:
devise_token_auth (0.1.37.beta4)
devise (~> 3.5.2)
rails (~> 4.2)
rails (< 6)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -86,7 +86,8 @@ GEM
codeclimate-test-reporter (0.4.8)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.0)
devise (3.5.2)
concurrent-ruby (1.0.0)
devise (3.5.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
Expand Down Expand Up @@ -132,7 +133,7 @@ GEM
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
method_source (0.8.2)
mime-types (2.6.2)
mime-types (2.99)
mini_portile (0.6.2)
minitest (5.8.1)
minitest-focus (1.1.2)
Expand Down Expand Up @@ -220,7 +221,8 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
sprockets (3.4.0)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
Expand Down Expand Up @@ -263,4 +265,4 @@ DEPENDENCIES
thor

BUNDLED WITH
1.10.5
1.10.6
2 changes: 1 addition & 1 deletion devise_token_auth.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.test_files = Dir["test/**/*"]
s.test_files.reject! { |file| file.match(/[.log|.sqlite3]$/) }

s.add_dependency "rails", "~> 4.2"
s.add_dependency "rails", "< 6"
s.add_dependency "devise", "~> 3.5.2"

s.add_development_dependency "sqlite3", "~> 1.3"
Expand Down

0 comments on commit 66ff79f

Please sign in to comment.