gitlabhq/app/views/merge_requests/show/_how_to_merge.html.haml

26 lines
638 B
Plaintext
Raw Normal View History

2012-02-18 13:43:35 +01:00
%div#modal_merge_info.modal.hide
.modal-header
%a.close{href: "#"} ×
2012-02-18 13:43:35 +01:00
%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 %>
2012-02-18 13:43:35 +01:00
:javascript
$(function(){
2012-05-30 18:46:09 +02:00
var modal = $('#modal_merge_info').modal({modal: true, show:false});
$('.how_to_merge_link').bind("click", function(){
2012-02-18 13:43:35 +01:00
modal.show();
});
$('.modal-header .close').bind("click", function(){
modal.hide();
})
})