2012-02-18 13:43:35 +01:00
|
|
|
|
%div#modal_merge_info.modal.hide
|
|
|
|
|
.modal-header
|
|
|
|
|
%a.close{:href => "#"} ×
|
|
|
|
|
%h3 How To Merge
|
|
|
|
|
.modal-body
|
|
|
|
|
%pre
|
|
|
|
|
:erb
|
2012-03-21 22:59:12 +01:00
|
|
|
|
git checkout <%= @merge_request.target_branch %>
|
2012-02-18 13:43:35 +01:00
|
|
|
|
git fetch origin
|
2012-03-21 22:59:12 +01:00
|
|
|
|
git merge origin/<%= @merge_request.source_branch %>
|
|
|
|
|
git push origin <%= @merge_request.target_branch %>
|
2012-02-18 13:43:35 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
:javascript
|
|
|
|
|
$(function(){
|
|
|
|
|
var modal = $('#modal_merge_info').modal({modal: true});
|
2012-03-16 00:45:46 +01:00
|
|
|
|
$('.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();
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|