2012-02-18 14:43:35 +02:00
|
|
|
|
%div#modal_merge_info.modal.hide
|
|
|
|
|
.modal-header
|
2012-08-10 18:07:50 -04:00
|
|
|
|
%a.close{href: "#"} ×
|
2012-02-18 14:43:35 +02:00
|
|
|
|
%h3 How To Merge
|
|
|
|
|
.modal-body
|
2012-08-22 03:56:53 +03:00
|
|
|
|
%pre.dark
|
2012-04-11 19:13:38 +00:00
|
|
|
|
= preserve do
|
2012-08-22 03:56:53 +03:00
|
|
|
|
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 14:43:35 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
:javascript
|
|
|
|
|
$(function(){
|
2012-05-30 19:46:09 +03:00
|
|
|
|
var modal = $('#modal_merge_info').modal({modal: true, show:false});
|
2012-03-16 01:45:46 +02:00
|
|
|
|
$('.how_to_merge_link').bind("click", function(){
|
2012-02-18 14:43:35 +02:00
|
|
|
|
modal.show();
|
|
|
|
|
});
|
|
|
|
|
$('.modal-header .close').bind("click", function(){
|
|
|
|
|
modal.hide();
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|