Merge branch…

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

Merge branch…
3ba4aa26 · Rémy Coutable · d568861d · 3f145899 · 3ba4aa26
Commit 3ba4aa26 authored Mar 23, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

merge.js.haml app/views/projects/merge_requests/merge.js.haml +2 -1

No files found.
--- a/app/views/projects/merge_requests/merge.js.haml
+++ b/app/views/projects/merge_requests/merge.js.haml
 - 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'))}");