diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-16 17:51:25 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-16 17:51:25 +0000 |
| commit | b5230bbe7c9f80ffaa0549cff7dea0d73f4490f8 (patch) | |
| tree | de937b448db483f65657b59f5169b7a9446e7053 /app | |
| parent | 4dfd4e0366c5b29a02a03c943b9f87c2070df4c3 (diff) | |
| parent | 5843d09f079946f60a8969c467d9a24e161cd84a (diff) | |
| download | gitlab-ce-b5230bbe7c9f80ffaa0549cff7dea0d73f4490f8.tar.gz | |
Merge branch 'fix-merge-immediately' into 'master'
Fix 'Merge Immediately' button
Fixes #4125
See merge request !2117
Diffstat (limited to 'app')
| -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 00321189e99..ab5c953189c 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -174,7 +174,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 |