kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Rémy Coutable 2017-03-23 23:50:16 +00:00
parent d568861d90 3f145899ca
commit 3ba4aa26ea
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/projects/merge_requests/merge.js.haml
View File

@ -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'))}");