From 5fcc239d7cc35173835ea8cc0ee116fdd798caa1 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Sat, 10 Sep 2016 18:42:28 +0200
Subject: [PATCH] Use bundler 1.12.5 on travis

closes #7084
---
 .travis.yml        | 2 +-
 script/ci/build.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1bcd8421a..697996c13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ branches:
     - 'develop'
 
 before_install:
-  - gem install bundler
+  - gem install bundler --version 1.12.5
   - mkdir travis-phantomjs
   - wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
   - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
diff --git a/script/ci/build.sh b/script/ci/build.sh
index 7a129f211..d07e45c8e 100755
--- a/script/ci/build.sh
+++ b/script/ci/build.sh
@@ -8,6 +8,6 @@ if [ "$DB" = "mysql" ]; then
   sed -i 's/*common/*mysql/' config/database.yml
 fi
 
-command="bundle exec rake --trace ci:travis:${BUILD_TYPE}"
+command="bundle _1.12.5_ exec rake --trace ci:travis:${BUILD_TYPE}"
 
 exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command