From ab913d41e2c26ef0274300575a65a5f33a4cf1e2 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Sun, 15 May 2022 12:33:11 +0000 Subject: [PATCH] Update Nokogiri to 1.10.10 for Ruby < 2.5.0, 1.12.5 for Ruby < 2.6.0 and 1.13.6 for Ruby >= 2.6.0 (#36912). git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21577 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 03a21afa3..e982bed29 100644 --- 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' -- 2.39.5