From: Go MAEDA <maeda@farend.jp>
Date: Tue, 8 Jan 2019 11:44:31 +0000 (+0000)
Subject: Merged r17777 and r17778 from trunk to 4.0-stable (#30241).
X-Git-Tag: 4.0.1~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=110d747d93b7c0723221723fee3fa502932e8aa8;p=redmine.git

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

diff --git a/Gemfile b/Gemfile
index 066ca22e7..34550ebda 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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