summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-24 05:20:26 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-24 05:20:26 +0000
commit6d10433732603b53f2b85538e71a9c865264307c (patch)
tree973c657d229d65dc57bc4ab2bcc09d52f3f7fe33 /Gemfile
parent08c9a5e3ef1a8abff1c950fb0862363970a95164 (diff)
downloadredmine-6d10433732603b53f2b85538e71a9c865264307c.tar.gz
redmine-6d10433732603b53f2b85538e71a9c865264307c.zip
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
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"