From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 21 Dec 2015 04:18:49 +0000 (+0000)
Subject: Merged r14977 from trunk to 2.6-stable (#21569)
X-Git-Tag: 2.6.10~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=315aa35c0c0fc1ddd2a79a5e4c02f0d6e03ec7a9;p=redmine.git

Merged r14977 from trunk to 2.6-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/2.6-stable@14992 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 3e09ffae6..d2aa7b92c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,6 +95,8 @@ group :test do
   gem "mocha", "~> 1.0.0", :require => 'mocha/api'
   if RUBY_VERSION >= '1.9.3'
     gem "capybara"
+    # Request at least nokogiri 1.6.7.1 because of security advisories
+    gem "nokogiri", ">= 1.6.7.1"
     gem "selenium-webdriver"
   end
 end