Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/config/application.rb b/config/application.rb
index be7d366c927..2f4d271322f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -285,6 +285,13 @@ module Gitlab
       g.factory_bot false
     end
 
+    # This empty initializer forces the :let_zeitwerk_take_over initializer to run before we load
+    # initializers in config/initializers. This is done because autoloading before Zeitwerk takes
+    # over is deprecated but our initializers do a lot of autoloading.
+    # See https://gitlab.com/gitlab-org/gitlab/issues/197346 for more details
+    initializer :move_initializers, before: :load_config_initializers, after: :let_zeitwerk_take_over do
+    end
+
     config.after_initialize do
       Rails.application.reload_routes!