diff --git a/.travis.yml b/.travis.yml index bc9ace734..2aba8b498 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,13 +11,13 @@ services: - mongodb - memcached env: - - RAILS_VERSION=5.0.0.beta3 + - RAILS_VERSION=5.0.0 - RAILS_VERSION=4.2.5 - RAILS_VERSION=3.2.21 matrix: # don't run rails 5 on ruby versions that can't install rack 2 exclude: - rvm: 2.0.0 - env: RAILS_VERSION=5.0.0.beta3 + env: RAILS_VERSION=5.0.0 - rvm: 2.1.8 - env: RAILS_VERSION=5.0.0.beta3 + env: RAILS_VERSION=5.0.0 diff --git a/flipper-active_record.gemspec b/flipper-active_record.gemspec index 535e051b6..71bee2ef8 100644 --- a/flipper-active_record.gemspec +++ b/flipper-active_record.gemspec @@ -24,5 +24,5 @@ Gem::Specification.new do |gem| gem.version = Flipper::VERSION gem.add_dependency 'flipper', "~> #{Flipper::VERSION}" - gem.add_dependency 'activerecord', ">= 3.2", "< 5" + gem.add_dependency 'activerecord', ">= 3.2", "< 6" end diff --git a/script/test b/script/test index df8e6acbf..03b9dd37f 100755 --- a/script/test +++ b/script/test @@ -20,6 +20,6 @@ export RAILS_VERSION=4.2.5 script/bootstrap || bundle update bundle exec rake -export RAILS_VERSION=5.0.0.rc1 +export RAILS_VERSION=5.0.0 script/bootstrap || bundle update bundle exec rake