Merged r15274 from trunk to 3.2-stable

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
This commit is contained in:
Toshi MARUYAMA
2016-03-24 05:53:32 +00:00
parent b2131b3245
commit dd1adc345e

View File

@@ -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"