From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 17 Jun 2017 10:48:32 +0000 (+0000)
Subject: Use Nokogiri 1.7.2 if possible (#26183).
X-Git-Tag: 3.4.0~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=02a84427017e32fac7488dbc9b63a71e5b3d80ba;p=redmine.git

Use Nokogiri 1.7.2 if possible (#26183).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@16676 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index d2117fc4b..e966d23a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "roadie-rails", "~> 1.1.1"
 gem "roadie", "~> 3.2.1"
 gem "mimemagic"
 
-gem "nokogiri", (RUBY_VERSION >= "2.1" ? ">= 1.7.0" : "~> 1.6.8")
+gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
 gem "i18n", "~> 0.7.0"
 gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"