From 9ded7d7db09641e905bba353113be472c206915e 2015-12-21 04:17:49
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2015-12-21 04:17:49
Subject: [PATCH] Merged r14977 from trunk to 3.1-stable (#21569)

Request at least nokogiri 1.6.7.1 because of security advisories.

Patch by Jan Schulz-Hofen.

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

---

diff --git a/Gemfile b/Gemfile
index 8079ec3..98e45be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,9 @@ gem "actionpack-action_caching"
 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"
+
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
 gem "rbpdf", "~> 1.18.7"