diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
| commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
| tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /app/models/merge_request | |
| parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
| download | gitlab-ce-1308dc5eb484ab0f8064989fc551ebdb4b1a7976.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request')
| -rw-r--r-- | app/models/merge_request/pipelines.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request/pipelines.rb b/app/models/merge_request/pipelines.rb index c32f29a9304..72756e8e9d0 100644 --- a/app/models/merge_request/pipelines.rb +++ b/app/models/merge_request/pipelines.rb @@ -61,6 +61,8 @@ class MergeRequest::Pipelines pipelines.joins(shas_table) end + # NOTE: this method returns only parent merge request pipelines. + # Child merge request pipelines have a different source. def triggered_by_merge_request source_project.ci_pipelines .where(source: :merge_request_event, merge_request: merge_request) |