diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
| commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
| tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /app/services/merge_requests | |
| parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/create_pipeline_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/create_pipeline_service.rb b/app/services/merge_requests/create_pipeline_service.rb index 9eb11820f7a..8258efba6bf 100644 --- a/app/services/merge_requests/create_pipeline_service.rb +++ b/app/services/merge_requests/create_pipeline_service.rb @@ -24,7 +24,7 @@ module MergeRequests ## # UpdateMergeRequestsWorker could be retried by an exception. # pipelines for merge request should not be recreated in such case. - return false if !allow_duplicate && merge_request.find_actual_head_pipeline&.triggered_by_merge_request? + return false if !allow_duplicate && merge_request.find_actual_head_pipeline&.merge_request? return false if merge_request.has_no_commits? true |