Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/gitlab/checks/matching_merge_request.rb b/lib/gitlab/checks/matching_merge_request.rb
index 3c4625577d4..e37cbc0442b 100644
--- a/lib/gitlab/checks/matching_merge_request.rb
+++ b/lib/gitlab/checks/matching_merge_request.rb
@@ -28,11 +28,7 @@ module Gitlab
           # report no matching merge requests. To avoid this, we check
           # the write location to ensure the replica can make this query.
           track_session_metrics do
-            if ::Feature.enabled?(:load_balancing_atomic_replica, @project, default_enabled: :yaml)
-              ::Gitlab::Database::LoadBalancing::Sticking.select_valid_host(:project, @project.id)
-            else
-              ::Gitlab::Database::LoadBalancing::Sticking.unstick_or_continue_sticking(:project, @project.id)
-            end
+            ::Gitlab::Database::LoadBalancing::Sticking.select_valid_host(:project, @project.id)
           end
         end