diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 05:54:55 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 05:54:55 +0000 |
| commit | 59e9564c6959cef21efb3a67d03d75861013e08e (patch) | |
| tree | ddfe3b7fe51d28af2164b7a17f733d1669bcf0ae | |
| parent | fa1653be8fa2492ca166c55f1e672876705bce42 (diff) | |
| download | redmine-59e9564c6959cef21efb3a67d03d75861013e08e.tar.gz redmine-59e9564c6959cef21efb3a67d03d75861013e08e.zip | |
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
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |