From a1b400242a1530511090f3e9e7c00949ccc3ed29 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jun 2017 08:37:20 +0000 Subject: [PATCH] Merged r16676 (#26183). git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16684 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8d15a106d..5d04bf609 100644 --- 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" -- 2.39.5