From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Thu, 16 Jun 2022 15:05:23 +0000 (+0000)
Subject: Merged r21635 to 5.0-stable (#37249).
X-Git-Tag: 5.0.2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f222d3d6b103a543d11db8052c63a032f584c529;p=redmine.git

Merged r21635 to 5.0-stable (#37249).


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

diff --git a/Gemfile b/Gemfile
index cf7a8d78f..29d639b9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,7 @@ 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.4')
+gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0')
 gem 'i18n', '~> 1.10.0'
 gem "rbpdf", "~> 1.20.0"
 gem 'addressable'