Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 3 deletions

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 35b727720ba..03260b28335 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -62,13 +62,16 @@ class CommitStatus < ApplicationRecord
     preload(project: :namespace)
   end
 
-  scope :match_id_and_lock_version, -> (slice) do
+  scope :match_id_and_lock_version, -> (items) do
     # it expects that items are an array of attributes to match
     # each hash needs to have `id` and `lock_version`
-    slice.inject(self) do |relation, item|
-      match = CommitStatus.where(item.slice(:id, :lock_version))
+    or_conditions = items.inject(none) do |relation, item|
+      match = CommitStatus.default_scoped.where(item.slice(:id, :lock_version))
+
       relation.or(match)
     end
+
+    merge(or_conditions)
   end
 
   # We use `CommitStatusEnums.failure_reasons` here so that EE can more easily