From cf3a0643a290fbf839dce3ba0ec1437591c52b65 Mon Sep 17 00:00:00 2001
From: Andrew White <andrew.white@unboxed.co>
Date: Thu, 3 Nov 2016 20:55:57 +0000
Subject: Reinstate railties tests on Ruby 1.8.7

Something changed in Bundler 1.12.0 that caused the railties tests
to start failing so lock the bundler version to 1.11.2.
---
 .travis.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1f24208a3..810ddeb65d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ services:
 
 bundler_args: --without test --jobs 3 --retry 3
 before_install:
-  - gem install bundler
+  - gem install bundler -v=1.11.2
 
 before_script:
   - bundle update
@@ -34,13 +34,6 @@ rvm:
   - 2.2.5
   - 2.3.1
 
-# Railties specs on Ruby 1.8.7 are broken.
-# Last recorded passing CI run is https://travis-ci.org/rails/rails/builds/48782330
-matrix:
-  allow_failures:
-    - rvm: 1.8.7
-      env: GEM=railties
-
 notifications:
   email: false
   irc:
-- 
cgit v1.2.3