diff --git a/.travis.yml b/.travis.yml index 94be5d0..c3fc35f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,13 @@ language: ruby env: - "RAILS_VERSION=4.2" - - "RAILS_VERSION=5.1" + - "RAILS_VERSION=5.2" - "RAILS_VERSION=master" rvm: - - 2.3.6 - - 2.4.3 - - 2.5.0 + - 2.3.8 + - 2.4.5 + - 2.5.3 matrix: fast_finish: true @@ -19,7 +19,8 @@ matrix: env: RAILS_VERSION=4.2 before_install: - - gem update bundler + - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true + - gem install bundler -v '< 2' before_script: - bundle exec rake app:db:setup diff --git a/Gemfile b/Gemfile index 72a62fd..810ce29 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ rails = case rails_version when "master" {github: "rails/rails"} when "default" - "~> 5.1" + "~> 5.2" else "~> #{rails_version}" end