Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 15 deletions

diff --git a/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml b/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml
deleted file mode 100644
index ffcd5352751..00000000000
--- a/config/feature_flags/development/ci_update_unlocked_pipeline_artifacts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_update_unlocked_pipeline_artifacts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97228
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372835
-milestone: '15.4'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb
index bcc62a6be5d..aa621602573 100644
--- a/config/initializers/load_balancing.rb
+++ b/config/initializers/load_balancing.rb
@@ -2,6 +2,15 @@
 
 Gitlab::Application.configure do |config|
   config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware)
+
+  # We need re-rerun the setup when code reloads in development
+  config.reloader.to_prepare do
+    if Gitlab.dev_or_test_env?
+      Gitlab::Database::LoadBalancing.base_models.each do |model|
+        Gitlab::Database::LoadBalancing::Setup.new(model).setup
+      end
+    end
+  end
 end
 
 Gitlab::Database::LoadBalancing.base_models.each do |model|
@@ -14,13 +23,6 @@ Gitlab::Database::LoadBalancing.base_models.each do |model|
   # information.
   Gitlab::Database::LoadBalancing::Setup.new(model).setup
 
-  # We need re-rerun the setup when code reloads in development
-  Rails.application.reloader.to_prepare do
-    if Rails.env.development? || Rails.env.test?
-      Gitlab::Database::LoadBalancing::Setup.new(model).setup
-    end
-  end
-
   # Database queries may be run before we fork, so we must set up the load
   # balancer as early as possible. When we do fork, we need to make sure all the
   # hosts are disconnected.