Skip to content
Snippets Groups Projects
Commit 5843d09f authored by Douwe Maan's avatar Douwe Maan
Browse files

Fix 'Merge Immediately' button

parent d60047bb
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -178,7 +178,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
@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)
.execute(@merge_request)
@status = :merge_when_build_succeeds
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment