merge.js.haml 763 Bytes
Newer Older
1
- case @status
2
- when :success
3
  :plain
4
    merge_request_widget.mergeInProgress(#{params[:should_remove_source_branch] == '1'});
5
- when :merge_when_pipeline_succeeds
6
  :plain
7
    $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/merge_when_pipeline_succeeds'))}");
8
<<<<<<< HEAD
9 10 11
- when :hook_validation_error
  :plain
    $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/error'))}");
12 13
=======
>>>>>>> ce/master
14 15 16
- when :sha_mismatch
  :plain
    $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/sha_mismatch'))}");
17
- else
18
  :plain
19
    $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}");