From 59e9564c6959cef21efb3a67d03d75861013e08e Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 24 Mar 2016 05:54:55 +0000
Subject: [PATCH] Merged r15274 from trunk to 3.1-stable

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

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15277 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 01acf1236..5f4ed84ac 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"
-- 
2.39.5