From 88368daf3e8b1ad3c71139108fcf0cb30771398c Mon Sep 17 00:00:00 2001
From: ishikawa999 <remember929@gmail.com>
Date: Mon, 27 Sep 2021 07:38:18 +0000
Subject: [PATCH 1/8] Explicitly require a class called in initializers that
 was loaded automatically until now

---
 app/models/custom_field.rb        |  2 --
 config/initializers/10-patches.rb |  1 +
 lib/plugins/acts_as_tree/init.rb  |  1 +
 lib/redmine.rb                    | 38 +++++++++++++++++++++++++++++++++++---
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 9787b2ee4d..b81dae233e 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -359,5 +359,3 @@ class CustomField < ActiveRecord::Base
     end
   end
 end
-
-require_dependency 'redmine/field_format'
diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 5788091b5e..850ab460a9 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_record'
+require 'redmine/i18n'
 
 module ActiveRecord
   class Base
diff --git a/lib/plugins/acts_as_tree/init.rb b/lib/plugins/acts_as_tree/init.rb
index e45bc11e53..cb8394e972 100644
--- a/lib/plugins/acts_as_tree/init.rb
+++ b/lib/plugins/acts_as_tree/init.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+require File.dirname(__FILE__) + '/lib/active_record/acts/tree'
 ActiveRecord::Base.send :include, ActiveRecord::Acts::Tree
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 5721667d81..d62521c4ef 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -37,6 +37,40 @@ end
 
 require 'redmine/acts/positioned'
 
+require 'redmine/helpers/url'
+require 'redmine/safe_attributes'
+require 'redmine/subclass_factory'
+require 'redmine/utils'
+require 'issue_relation'
+require 'redmine/configuration'
+require 'redmine/scm/adapters/command_failed'
+require 'redmine/wiki_formatting'
+require 'redmine/wiki_formatting/macros'
+require 'redmine/wiki_formatting/html_parser'
+require 'redmine/wiki_formatting/textile/helper'
+require 'redmine/wiki_formatting/textile/formatter'
+require 'redmine/wiki_formatting/textile/html_parser'
+if Object.const_defined?(:Redcarpet)
+  require 'redmine/wiki_formatting/markdown/helper'
+  require 'redmine/wiki_formatting/markdown/formatter'
+  require 'redmine/wiki_formatting/markdown/html_parser'
+end
+if Object.const_defined?(:CommonMarker)
+  require 'html/pipeline'
+  require 'redmine/wiki_formatting/common_mark/markdown_filter'
+  require 'redmine/wiki_formatting/common_mark/sanitization_filter'
+  require 'redmine/wiki_formatting/common_mark/syntax_highlight_filter'
+  require 'redmine/wiki_formatting/common_mark/fixup_auto_links_filter'
+  require 'redmine/wiki_formatting/common_mark/external_links_filter'
+  require 'redmine/wiki_formatting/common_mark/formatter'
+  require 'redmine/wiki_formatting/common_mark/helper'
+  require 'redmine/wiki_formatting/common_mark/html_parser'
+end
+
+require 'redmine/pagination'
+require 'redmine/sudo_mode'
+require 'redmine/views/api_template_handler'
+require 'redmine/export/csv'
 require 'redmine/scm/base'
 require 'redmine/access_control'
 require 'redmine/access_keys'
@@ -44,7 +78,6 @@ require 'redmine/activity'
 require 'redmine/activity/fetcher'
 require 'redmine/ciphering'
 require 'redmine/codeset_util'
-require 'redmine/field_format'
 require 'redmine/info'
 require 'redmine/menu_manager'
 require 'redmine/notifiable'
@@ -56,9 +89,7 @@ require 'redmine/sort_criteria'
 require 'redmine/syntax_highlighting'
 require 'redmine/thumbnail'
 require 'redmine/unified_diff'
-require 'redmine/utils'
 require 'redmine/version'
-require 'redmine/wiki_formatting'
 
 require 'redmine/default_data/loader'
 require 'redmine/helpers/calendar'
@@ -72,6 +103,7 @@ require 'redmine/views/builders'
 require 'redmine/themes'
 require 'redmine/hook'
 require 'redmine/hook/listener'
+require 'application_helper'
 require 'redmine/hook/view_listener'
 require 'redmine/plugin'
 require 'redmine/twofa'
-- 
2.11.0