From 63da8a973bebfe41b8dd2ded18718ec954ec6b3e Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@finn.de>
Date: Wed, 21 Sep 2016 09:01:48 +0200
Subject: [PATCH] Update ruby version && fix bundler on travis

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 93d28d4675..81d3c18cae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@
 language: ruby
 
 rvm:
-  - 2.2.3
+  - 2.3.1
 
 sudo: false
 
@@ -91,7 +91,9 @@ before_install:
   - git checkout openproject/$TRAVIS_BRANCH
 
   # End of custom plugin instructions.
-
+  - "rvm @default,@global do gem uninstall bundler -a -x"
+  - gem install bundler -v 1.12.5
+  - echo `bundle -v`
   - "echo `firefox -v`"
   - "export DISPLAY=:99.0"
   - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"