Merge pull request #5 from gravityslave92/master

Remove hindrance for migrating to rails 6
This commit is contained in:
jdanielian 2019-09-07 08:33:01 -04:00 committed by GitHub
commit 72becffefe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions

View File

@ -4,14 +4,14 @@ source 'https://rubygems.org'
# Allow the rails version to come from an ENV setting so Travis can test multiple versions. # Allow the rails version to come from an ENV setting so Travis can test multiple versions.
# See http://www.schneems.com/post/50991826838/testing-against-multiple-rails-versions/ # See http://www.schneems.com/post/50991826838/testing-against-multiple-rails-versions/
rails_version = ENV['RAILS_VERSION'] || '5.1.2' rails_version = ENV['RAILS_VERSION'] || '5.2.3'
gem 'rails', rails_version.to_s gem 'rails', rails_version.to_s
case rails_version.split('.').first case rails_version.split('.').first
when '3' when '3'
gem 'strong_parameters' gem 'strong_parameters'
when '4', '5' when '4', '5', '6'
gem 'responders' gem 'responders'
end end

View File

@ -13,5 +13,5 @@ Gem::Specification.new do |s|
s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile"] s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile"]
s.add_dependency 'railties', '>= 3.1', '< 6.0' s.add_dependency 'railties', '>= 3.1', '< 7.0'
end end

View File

@ -15,9 +15,9 @@ Gem::Specification.new do |s|
s.files = Dir['{lib}/**/*'] + %w[MIT-LICENSE Rakefile] s.files = Dir['{lib}/**/*'] + %w[MIT-LICENSE Rakefile]
s.add_dependency 'activesupport', '>= 3.1', '< 6.0' s.add_dependency 'activesupport', '>= 3.1', '< 7.0'
s.add_dependency 'json-schema', '~> 2.2' s.add_dependency 'json-schema', '~> 2.2'
s.add_dependency 'railties', '>= 3.1', '< 6.0' s.add_dependency 'railties', '>= 3.1', '< 7.0'
s.add_dependency 'hashie' s.add_dependency 'hashie'
s.add_development_dependency 'guard-rspec' s.add_development_dependency 'guard-rspec'
end end

View File

@ -13,6 +13,6 @@ Gem::Specification.new do |s|
s.files = Dir.glob("{lib,node_modules}/**/*") + ["MIT-LICENSE", "Rakefile" ] s.files = Dir.glob("{lib,node_modules}/**/*") + ["MIT-LICENSE", "Rakefile" ]
s.add_dependency 'actionpack', '>=3.1', '< 6.0' s.add_dependency 'actionpack', '>=3.1', '< 7.0'
s.add_dependency 'railties', '>= 3.1', '< 6.0' s.add_dependency 'railties', '>= 3.1', '< 7.0'
end end