From: Go MAEDA <maeda@farend.jp>
Date: Thu, 22 Jun 2023 01:40:40 +0000 (+0000)
Subject: Update Nokogiri to 1.15.2 in 5.0-stable (#38539).
X-Git-Tag: 5.0.6~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e07214cb6025ff9639dff94ffd5c8d5105ee8e5c;p=redmine.git

Update Nokogiri to 1.15.2 in 5.0-stable (#38539).

Patch by Holger Just.


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

diff --git a/Gemfile b/Gemfile
index 25471f18f..174852298 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,13 @@ gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' :
 gem 'marcel'
 gem "mail", "~> 2.7.1"
 gem 'csv', '~> 3.2.0'
-gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10')
+gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.6.0')
+                   '~> 1.12.5'
+                 elsif Gem.ruby_version < Gem::Version.new('2.7.0')
+                   '~> 1.13.10'
+                 else
+                   '~> 1.15.2'
+                 end)
 gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0')
 gem 'i18n', '~> 1.10.0'
 gem 'rbpdf', '~> 1.21.0'