From 6b82aef321638cf4730fc784f6e6dbfa8fb91511 Mon Sep 17 00:00:00 2001
From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Thu, 11 Jan 2024 06:16:17 +0000
Subject: [PATCH] Switch default backend of ActiveSupport::XmlMini from rexml
 to Nokogiri (#37258).

git-svn-id: https://svn.redmine.org/redmine/trunk@22599 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile                           | 1 -
 config/initializers/30-redmine.rb | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 1520383fa..72afb0782 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,6 @@ gem 'csv', '~> 3.2.6'
 gem 'net-imap', '~> 0.3.4'
 gem 'net-pop', '~> 0.1.2'
 gem 'net-smtp', '~> 0.3.3'
-gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0')
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb
index fc36977f6..62969e4a6 100644
--- a/config/initializers/30-redmine.rb
+++ b/config/initializers/30-redmine.rb
@@ -8,6 +8,9 @@ Rails.application.config.to_prepare do
   # Forces I18n to load available locales from the backend
   I18n.config.available_locales = nil
 
+  # Use Nokogiri as XML backend instead of Rexml
+  ActiveSupport::XmlMini.backend = 'Nokogiri'
+
   Redmine::Preparation.prepare
 end