diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-01-08 11:44:31 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-01-08 11:44:31 +0000 |
| commit | 110d747d93b7c0723221723fee3fa502932e8aa8 (patch) | |
| tree | 5851a16646e77456bbb87936db2be01a6f070148 | |
| parent | d85c2898dcbf4670e9dc72667c628defd631bbf3 (diff) | |
| download | redmine-110d747d93b7c0723221723fee3fa502932e8aa8.tar.gz redmine-110d747d93b7c0723221723fee3fa502932e8aa8.zip | |
Merged r17777 and r17778 from trunk to 4.0-stable (#30241).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17779 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,7 +14,7 @@ gem "mimemagic" gem "mail", "~> 2.7.1" gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" -gem "nokogiri", "~> 1.9.0" +gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") gem "i18n", "~> 0.7.0" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem |