From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 24 Mar 2016 05:20:26 +0000 (+0000)
Subject: Gemfile: switch mime-types version by Ruby >= 2.0 or not
X-Git-Tag: 3.3.0~171
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d10433732603b53f2b85538e71a9c865264307c;p=redmine.git

Gemfile: switch mime-types version by Ruby >= 2.0 or not

git-svn-id: http://svn.redmine.org/redmine/trunk@15274 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 7092e2ca2..55e11b9db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem "jquery-rails", "~> 3.1.4"
 gem "coderay", "~> 1.1.0"
 gem "builder", ">= 3.0.4"
 gem "request_store", "1.0.5"
-gem "mime-types"
+gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
 gem "protected_attributes"
 gem "actionpack-action_caching"
 gem "actionpack-xml_parser"