Merged r16676 (#26183).

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

diff --git a/Gemfile b/Gemfile
index 8d15a106d5ab9182b228741ead4cf2994c449e7d..5d04bf609acda4585ffd92642366f14f897230b5 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem "roadie-rails", "~> 1.1.1"
 gem "roadie", "~> 3.2.1"
 gem "mimemagic"
 
-gem "nokogiri", "~> 1.6.8"
+gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
 gem "i18n", "~> 0.7.0"
 gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"