26 lines
638 B
Plaintext
26 lines
638 B
Plaintext
%div#modal_merge_info.modal.hide
|
||
.modal-header
|
||
%a.close{href: "#"} ×
|
||
%h3 How To Merge
|
||
.modal-body
|
||
%pre
|
||
= preserve do
|
||
:erb
|
||
git checkout <%= @merge_request.target_branch %>
|
||
git fetch origin
|
||
git merge origin/<%= @merge_request.source_branch %>
|
||
git push origin <%= @merge_request.target_branch %>
|
||
|
||
|
||
:javascript
|
||
$(function(){
|
||
var modal = $('#modal_merge_info').modal({modal: true, show:false});
|
||
$('.how_to_merge_link').bind("click", function(){
|
||
modal.show();
|
||
});
|
||
$('.modal-header .close').bind("click", function(){
|
||
modal.hide();
|
||
})
|
||
})
|
||
|