diff options
| author | Sam Rose <sam@gitlab.com> | 2017-03-15 03:51:32 +0300 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2017-03-22 18:10:36 +0300 |
| commit | 3f145899cac85efec748e2c15a535a300313503d (patch) | |
| tree | 7a06c1bb10b388b07fc4e508243ddfd22b9e9c62 | |
| parent | 6194db8c15d1acf9adedd2f90e2cb2f49f1c624a (diff) | |
Check remove source branch when merge is in progress
| -rw-r--r-- | app/views/projects/merge_requests/merge.js.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/merge.js.haml b/app/views/projects/merge_requests/merge.js.haml index f0a23bec5e7..e632fc681cf 100644 --- a/app/views/projects/merge_requests/merge.js.haml +++ b/app/views/projects/merge_requests/merge.js.haml @@ -1,7 +1,8 @@ - case @status - when :success + - remove_source_branch = params[:should_remove_source_branch] == '1' || @merge_request.remove_source_branch? :plain - merge_request_widget.mergeInProgress(#{params[:should_remove_source_branch] == '1'}); + merge_request_widget.mergeInProgress(#{remove_source_branch}); - when :merge_when_pipeline_succeeds :plain $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/merge_when_pipeline_succeeds'))}"); |