diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-24 02:50:16 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-24 02:50:16 +0300 |
| commit | 3ba4aa26eadd0aca3453d97b37123f02a4307a5b (patch) | |
| tree | a025f36c862d3065c037e3f5a68ea043f7e54f77 | |
| parent | d568861d90fa44e49b2d87876749bfed1ab99eee (diff) | |
| parent | 3f145899cac85efec748e2c15a535a300313503d (diff) | |
Merge branch '28772-remove-source-branch-button-sometimes-appears-even-if-remove-branch-checkbox-is-checked' into 'master'
Resolve "`Remove source branch` button sometimes appears even if `remove branch` checkbox is checked"
Closes #28772
See merge request !9948
| -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'))}"); |