diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2015-11-24 22:41:36 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2015-12-04 10:43:33 -0500 |
| commit | aa1ba0093632a66c9c9c0eac710d63d7513ad358 (patch) | |
| tree | 9fe78dfa860f1607667bd9462ff46c58df914def /app/views/projects/merge_requests/merge.js.haml | |
| parent | 238ca3e472a67d319521daa5aeab6455b4740cdb (diff) | |
| download | gitlab-ce-aa1ba0093632a66c9c9c0eac710d63d7513ad358.tar.gz | |
Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583
Diffstat (limited to 'app/views/projects/merge_requests/merge.js.haml')
| -rw-r--r-- | app/views/projects/merge_requests/merge.js.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/merge.js.haml b/app/views/projects/merge_requests/merge.js.haml index 33321651e32..518ecb9f00f 100644 --- a/app/views/projects/merge_requests/merge.js.haml +++ b/app/views/projects/merge_requests/merge.js.haml @@ -1,6 +1,6 @@ - if @status :plain - merge_request_widget.mergeInProgress(); + merge_request_widget.mergeInProgress(#{params[:should_remove_source_branch] == '1'}); - else :plain $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}"); |