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

Request at least nokogiri 1.6.7.2 because of security advisories.

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

diff --git a/Gemfile b/Gemfile
index 98e45be5834dfc645eaa93e92a5f2cd6e2bb82a4..ad58e22b90e9b12bf7253a175a74529e7aeed65d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "actionpack-xml_parser"
 gem "loofah", "~> 2.0"
 
 # 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]