diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-08 18:50:24 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-08 18:50:24 +0300 |
| commit | cae84aa2788af60219bbca1a83ae63941f11bf47 (patch) | |
| tree | 23f0581d48ebc62f6916bf50731377772ed6b510 /app/services/merge_requests/merge_when_build_succeeds_service.rb | |
| parent | 57ec290f0c47d04745e49598c490735b3e650edb (diff) | |
| parent | 53498e42868f258a5e0cda7894fa4de8e8d4f8e9 (diff) | |
| download | gitlab-ce-cae84aa2788af60219bbca1a83ae63941f11bf47.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
Diffstat (limited to 'app/services/merge_requests/merge_when_build_succeeds_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_when_build_succeeds_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/merge_when_build_succeeds_service.rb b/app/services/merge_requests/merge_when_build_succeeds_service.rb index 8fd6a4ea1f6..12edfb2d671 100644 --- a/app/services/merge_requests/merge_when_build_succeeds_service.rb +++ b/app/services/merge_requests/merge_when_build_succeeds_service.rb @@ -20,10 +20,10 @@ module MergeRequests # Triggers the automatic merge of merge_request once the build succeeds def trigger(commit_status) - each_merge_request(commit_status) do |merge_request, ci_commit| + each_merge_request(commit_status) do |merge_request, pipeline| next unless merge_request.merge_when_build_succeeds? next unless merge_request.mergeable? - next unless ci_commit.success? + next unless pipeline.success? MergeWorker.perform_async(merge_request.id, merge_request.merge_user_id, merge_request.merge_params) end |