Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-01-04 14:06:20 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2019-01-04 14:06:20 +0300
commit8002c5056f9a827e16f7f4885c6740a9f69a9ff6 (patch)
tree90952497d6b0d2b63eef870d776294f92fae1915 /app/models/ci/pipeline.rb
parent297d1fa092375a9a22630e235528522a0f733e7d (diff)
parent11d622d5365c72b77fb7d79f9a2d3ce67a27910d (diff)
Merge branch 'use-cheap-operation-for-ci-pipeline-all_merge_requests' into 'master'
Use cheap operation for `Ci::Pipeline#all_merge_requests` Closes #54907 See merge request gitlab-org/gitlab-ce!24115
Diffstat (limited to 'app/models/ci/pipeline.rb')
-rw-r--r--app/models/ci/pipeline.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index c12403ea9d2..01134e133db 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -635,7 +635,7 @@ module Ci
def all_merge_requests
@all_merge_requests ||=
if merge_request?
- project.merge_requests.where(id: merge_request.id)
+ project.merge_requests.where(id: merge_request_id)
else
project.merge_requests.where(source_branch: ref)
end