diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 17:38:58 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 17:38:58 +0100 |
| commit | 5843d09f079946f60a8969c467d9a24e161cd84a (patch) | |
| tree | 8bcbe2a6d15b2a7854f74f22344ce81a27e39af7 | |
| parent | d60047bb312df9efacd09bf9527787461cd78b3e (diff) | |
| download | gitlab-ce-fix-merge-immediately.tar.gz | |
Fix 'Merge Immediately' buttonfix-merge-immediately
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index fffd90d87eb..0838978dd1e 100644 --- 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 |