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

25 lines
641 B
Text
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

%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();
})
})