GitLab steht Mittwoch, den 08. Juli, zwischen 09:00 und 13:00 Uhr aufgrund von Wartungsarbeiten nicht zur Verfügung.

Commit 5843d09f authored by Douwe Maan's avatar Douwe Maan

Fix 'Merge Immediately' button

parent d60047bb
......@@ -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 &&
if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit &&, current_user, merge_params)
@status = :merge_when_build_succeeds
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment