Merge branch 'fix-merge-immediately' into 'master'
Fix 'Merge Immediately' button Fixes #4125 See merge request !2117
This commit is contained in:
commit
b5230bbe7c
|
@ -174,7 +174,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
||||||
|
|
||||||
@merge_request.update(merge_error: nil)
|
@merge_request.update(merge_error: nil)
|
||||||
|
|
||||||
if params[:merge_when_build_succeeds] && @merge_request.ci_commit && @merge_request.ci_commit.active?
|
if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit && @merge_request.ci_commit.active?
|
||||||
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
|
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
|
||||||
.execute(@merge_request)
|
.execute(@merge_request)
|
||||||
@status = :merge_when_build_succeeds
|
@status = :merge_when_build_succeeds
|
||||||
|
|
Loading…
Reference in New Issue