From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 26 Jan 2016 04:18:45 +0000 (+0000)
Subject: Merged r15096 from trunk to 3.2-stable (#21843)
X-Git-Tag: 3.2.1~36
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3215633744fe1d4dfd8b32f0ee449fae85913889;p=redmine.git

Merged r15096 from trunk to 3.2-stable (#21843)

Request at least nokogiri 1.6.7.2 because of security advisories.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15097 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index c4fbc127b..d6983ad36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "actionpack-xml_parser"
 gem "roadie-rails"
 
 # Request at least nokogiri 1.6.7.1 because of security advisories
-gem "nokogiri", ">= 1.6.7.1"
+gem "nokogiri", ">= 1.6.7.2"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]