Check if pipeline is nil before merging

This commit is contained in:
Z.J. van de Weg
2016-06-23 09:50:00 +02:00
parent 93106e150d
commit 14fdcc196b
2 changed files with 10 additions and 2 deletions
+3
View File
@@ -1,5 +1,8 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.9.1 (unreleased)
- Fix in auto merge when pipeline is nil
v 8.9.0 (unreleased)
- Fix builds API response not including commit data
- Fix error when CI job variables key specified but not defined
@@ -204,8 +204,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request.update(merge_error: nil)
if params[:merge_when_build_succeeds].present?
if @merge_request.pipeline && @merge_request.pipeline.active?
if params[:merge_when_build_succeeds].present?
unless @merge_request.pipeline
@status = :failed
return
end
if @merge_request.pipeline.active?
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
.execute(@merge_request)
@status = :merge_when_build_succeeds