From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 10 Jun 2013 08:24:46 +0000 (+0000)
Subject: 2.3-stable: pin nokogiri version < 1.6.0 (#14245)
X-Git-Tag: 2.3.2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5b8af329e279c24cf7d6efcdf9d62aa49b9c9b55;p=redmine.git

2.3-stable: pin nokogiri version < 1.6.0 (#14245)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11953 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 8a6c3568c..36f556146 100644
--- a/Gemfile
+++ b/Gemfile
@@ -80,6 +80,7 @@ group :test do
   gem "shoulda", "~> 3.3.2"
   gem "mocha", "~> 0.13.3"
   gem 'capybara', '~> 2.0.0'
+  gem 'nokogiri', '< 1.6.0'
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")