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 cf7a8d78fa1bcedff95728311b2ef968dcd57871..29d639b9a7eb62ea8efb2f3b192adfbbb27c1e89 100644 (file)
--- 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'