diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 05:53:32 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 05:53:32 +0000 |
| commit | dd1adc345e96dade7b20684388a0dfe2f610abfe (patch) | |
| tree | 2a60678e99048ead964c9cf0a65c0b830be4bd58 /Gemfile | |
| parent | b2131b32453ad479b2df561836cff1d816c54f05 (diff) | |
| download | redmine-dd1adc345e96dade7b20684388a0dfe2f610abfe.tar.gz redmine-dd1adc345e96dade7b20684388a0dfe2f610abfe.zip | |
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
Diffstat (limited to 'Gemfile')
| -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" |