From afd20039ee4d57f09d39d4f32b29328d52921fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Riveros?= <aariveros@resit.cl>
Date: Mon, 21 Jan 2019 00:36:34 -0300
Subject: [PATCH] bundler 2 and rails 4.2 conflict

---
 .travis.yml | 11 ++++++-----
 Gemfile     |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

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