Fix 'Merge Immediately' button

5843d09f · Douwe Maan · d60047bb · 5843d09f
Commit 5843d09f authored Dec 16, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_requests_controller.rb app/controllers/projects/merge_requests_controller.rb +1 -1

No files found.
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -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