Update Nokogiri to 1.10.10 for Ruby < 2.5.0, 1.12.5 for Ruby < 2.6.0 and 1.13.6 for...

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21577 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 03a21afa33c73570fcfa69badbabc8ae32bff108..e982bed2980f0252466881a8e482060473844c2f 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,13 @@ gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0')
 gem 'marcel'
 gem "mail", "~> 2.7.1"
 gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
-gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
+gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0')
+                   '~> 1.10.10'
+                 elsif Gem.ruby_version < Gem::Version.new('2.6.0')
+                   '~> 1.12.5'
+                 else
+                   '~> 1.13.6'
+                 end)
 gem 'i18n', '~> 1.8.2'
 gem "rbpdf", "~> 1.20.0"
 gem 'addressable'