]> source.dussan.org Git - redmine.git/commitdiff
Merged r15274 from trunk to 3.2-stable
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 24 Mar 2016 05:53:32 +0000 (05:53 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 24 Mar 2016 05:53:32 +0000 (05:53 +0000)
Gemfile: switch mime-types version by Ruby >= 2.0 or not

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15276 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

diff --git a/Gemfile b/Gemfile
index 7092e2ca27354fe991bf36a2ab8473b10652c02b..55e11b9dbee9db8d9e002ee2d88b9f65f06478f3 100644 (file)
--- 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"