Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 15 insertions, 17 deletions

diff --git a/lib/gitlab/checks/matching_merge_request.rb b/lib/gitlab/checks/matching_merge_request.rb
index e37cbc0442b..e5ce862264f 100644
--- a/lib/gitlab/checks/matching_merge_request.rb
+++ b/lib/gitlab/checks/matching_merge_request.rb
@@ -13,23 +13,21 @@ module Gitlab
       end
 
       def match?
-        if ::Gitlab::Database::LoadBalancing.enable?
-          # When a user merges a merge request, the following sequence happens:
-          #
-          # 1. Sidekiq: MergeService runs and updates the merge request in a locked state.
-          # 2. Gitaly: The UserMergeBranch RPC runs.
-          # 3. Gitaly (gitaly-ruby): This RPC calls the pre-receive hook.
-          # 4. Rails: This hook makes an API request to /api/v4/internal/allowed.
-          # 5. Rails: This API check does a SQL query for locked merge
-          #    requests with a matching SHA.
-          #
-          # Since steps 1 and 5 will happen on different database
-          # sessions, replication lag could erroneously cause step 5 to
-          # 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
-            ::Gitlab::Database::LoadBalancing::Sticking.select_valid_host(:project, @project.id)
-          end
+        # When a user merges a merge request, the following sequence happens:
+        #
+        # 1. Sidekiq: MergeService runs and updates the merge request in a locked state.
+        # 2. Gitaly: The UserMergeBranch RPC runs.
+        # 3. Gitaly (gitaly-ruby): This RPC calls the pre-receive hook.
+        # 4. Rails: This hook makes an API request to /api/v4/internal/allowed.
+        # 5. Rails: This API check does a SQL query for locked merge
+        #    requests with a matching SHA.
+        #
+        # Since steps 1 and 5 will happen on different database
+        # sessions, replication lag could erroneously cause step 5 to
+        # 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
+          ::ApplicationRecord.sticking.select_valid_host(:project, @project.id)
         end
 
         # rubocop: disable CodeReuse/ActiveRecord