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 066ca22e7d62c22396fe2f84a247aff27af210e3..34550ebda418bb9eacbdaf89eb943216ab4edc38 100644 (file)
--- 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