diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-04 11:06:20 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-04 11:06:20 +0000 |
| commit | 8002c5056f9a827e16f7f4885c6740a9f69a9ff6 (patch) | |
| tree | 90952497d6b0d2b63eef870d776294f92fae1915 | |
| parent | 297d1fa092375a9a22630e235528522a0f733e7d (diff) | |
| parent | 11d622d5365c72b77fb7d79f9a2d3ce67a27910d (diff) | |
| download | gitlab-ce-8002c5056f9a827e16f7f4885c6740a9f69a9ff6.tar.gz | |
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
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 |
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 |