diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-01-04 19:47:39 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-01-04 19:47:39 +0900 |
| commit | 4ab0b33db6f328fc68394fd3af992052f883401e (patch) | |
| tree | eb320ae2dda0d047eb5a3c8a42f9d472f5330f05 | |
| parent | c6b7954bca9562d42797b8f9f5c3da6f4657cccc (diff) | |
| download | gitlab-ce-user-update-head-pipeline-worker-2.tar.gz | |
Clarify comments about for_merge_requestuser-update-head-pipeline-worker-2
| -rw-r--r-- | app/models/ci/pipeline.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 8b95e83635b..5b446e649a9 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -180,8 +180,9 @@ module Ci scope :for_merge_request, -> (merge_request, ref, sha) do ## - # We have to filter out unrelated MR pipelines, in case, - # there are two merge requests from the same source branch + # We have to filter out unrelated MR pipelines. + # When merge request is empty, it selects general pipelines, such as push sourced pipelines. + # When merge request is matched, it selects MR pipelines. where(merge_request: [nil, merge_request], ref: ref, sha: sha) .sort_by_merge_request_pipelines end |