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 3e09ffae602ecad7b61b6f90d761baa749bfae58..d2aa7b92c57808ad65b77cb9826e362bcf880628 100644 (file)
--- 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