Commit b5230bbe authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix-merge-immediately' into 'master'

Fix 'Merge Immediately' button

Fixes #4125

See merge request !2117
parents 4dfd4e03 5843d09f
......@@ -174,7 +174,7 @@ def merge
@merge_request.update(merge_error: nil)
if params[:merge_when_build_succeeds] && @merge_request.ci_commit &&
if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit &&, current_user, merge_params)
@status = :merge_when_build_succeeds
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment