Commit 3ba4aa26 authored by Rémy Coutable's avatar Rémy Coutable

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
parents d568861d 3f145899
- 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'))}");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment