mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-13 22:59:19 +10:00
Check if pipeline is nil before merging
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user