summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2025-03-02 07:19:23 +0000
committerGo MAEDA <maeda@farend.jp>2025-03-02 07:19:23 +0000
commit97dd29f25180544a85478c75290145465d6afeca (patch)
tree7a5fc6b10fb509138d6416861eb681538d6e69ee
parentc86b8916464e4060b36ea43a3e265ee96a0838b7 (diff)
downloadredmine-97dd29f25180544a85478c75290145465d6afeca.tar.gz
redmine-97dd29f25180544a85478c75290145465d6afeca.zip
Update Nokogiri to 1.18.3 in 5.0-stable (#42333).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@23517 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 18b9424b0..fb097a3c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,12 +13,16 @@ 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', (if Gem.ruby_version < Gem::Version.new('2.6.0')
- '~> 1.12.5'
- elsif Gem.ruby_version < Gem::Version.new('2.7.0')
+gem 'nokogiri', (if Gem.ruby_version >= Gem::Version.new('3.1.0')
+ '~> 1.18.3'
+ elsif Gem.ruby_version >= Gem::Version.new('3.0.0')
+ '~> 1.17.2'
+ elsif Gem.ruby_version >= Gem::Version.new('2.7.0')
+ '~> 1.15.7'
+ elsif Gem.ruby_version >= Gem::Version.new('2.6.0')
'~> 1.13.10'
else
- '~> 1.15.2'
+ '~> 1.12.5'
end)
gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0')
gem 'i18n', '~> 1.10.0'