summaryrefslogtreecommitdiff
path: root/app/models/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-14 03:09:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-14 03:09:39 +0000
commit52cacdb89bb29f355e0c3a33c3250ac2d3fea036 (patch)
tree106e4128d0b9e454f60287c9895fc2182e82db21 /app/models/ci
parent9398d718d92a40a0a917040645a55dea51467a91 (diff)
downloadgitlab-ce-52cacdb89bb29f355e0c3a33c3250ac2d3fea036.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
-rw-r--r--app/models/ci/pipeline.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 3ce44a066ae..8a3ca2e758c 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -736,6 +736,7 @@ module Ci
MergeRequest.where(id: merge_request_id)
else
MergeRequest.where(source_project_id: project_id, source_branch: ref)
+ .by_commit_sha(sha)
end
end