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:
authorShinya Maeda <shinya@gitlab.com>2019-03-27 11:46:29 +0300
committerShinya Maeda <shinya@gitlab.com>2019-05-06 09:20:47 +0300
commitd4d2cf7327ed077e063d64dcfe3b8275286c2d06 (patch)
treee34dd4a38e8dd37670f6922e1b884634132c89b9 /app/services/merge_requests
parent9aa81c0a95b0e54bbafca4755e95f27ee1eeb759 (diff)
Fix merge request pipeline exist method
Refactor
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r--app/services/merge_requests/base_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index a9dd26c02ad..bb9062e9b40 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -81,7 +81,7 @@ module MergeRequests
##
# UpdateMergeRequestsWorker could be retried by an exception.
# pipelines for merge request should not be recreated in such case.
- return false if merge_request.merge_request_pipeline_exists?
+ return false if merge_request.find_actual_head_pipeline&.triggered_by_merge_request?
return false if merge_request.has_no_commits?
true