f680eca912
Set a `sha` parameter on the MR form. If this doesn't match the HEAD of the source branch when the form is submitted, show a warning (like with a merge conflict) and don't merge the branch.
13 lines
571 B
Text
13 lines
571 B
Text
- case @status
|
|
- when :success
|
|
:plain
|
|
merge_request_widget.mergeInProgress(#{params[:should_remove_source_branch] == '1'});
|
|
- when :merge_when_build_succeeds
|
|
:plain
|
|
$('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/merge_when_build_succeeds'))}");
|
|
- when :sha_mismatch
|
|
:plain
|
|
$('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/sha_mismatch'))}");
|
|
- else
|
|
:plain
|
|
$('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}");
|