From b01182746f1c0bfe3539a5509ab1074de4ff6931 Mon Sep 17 00:00:00 2001
From: Mehdi Lahmam <mehdi@craftsmen.io>
Date: Tue, 29 Dec 2015 23:38:02 +0100
Subject: [PATCH] Fix Travis JRuby mode for JRuby 1.7

Since #1754 merge, JRuby builds fails due to the new hash syntax.
See https://travis-ci.org/carrierwaveuploader/carrierwave/jobs/93603851
This is due to JRuby mode. `jruby` resolves to 1.7.10 in 1.9 mode and
`jruby-head` resolves to the JRuby master branch in 2.1 mode.
As Travis doesn't support d20 and d21 for JRuby (see https://github.com/travis-ci/travis-ci/issues/2432#issuecomment-46647960),
using `JRUBY_OPTS` sets the mode to run for JRuby 1.7.
This matches MRI Ruby minimal requirements for CarrierWave 1.0.0.
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c8f66f958..15051a846 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ rvm:
  - jruby
  - jruby-head
 
+env:
+  - JRUBY_OPTS="--2.0"
+
 gemfile:
   - Gemfile
   - gemfiles/rails-4-0-stable.gemfile