deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

How to merge instructions

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-18 14:43:35 +02:00
parent 94db8a1c33
commit fa7bd43ab9
7 changed files with 388 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/views/merge_requests/_how_to_merge.html.haml Normal file
View file

@ -0,0 +1,25 @@
%div#modal_merge_info.modal.hide
.modal-header
%a.close{:href => "#"} ×
%h3 How To Merge
.modal-body
%pre
:erb
git fetch origin
git checkout -b <%=@merge_request.source_branch%> origin/<%=@merge_request.source_branch%>
git checkout <%=@merge_request.target_branch%>
git merge <%=@merge_request.source_branch%>
git push origin <%=@merge_request.target_branch%>
:javascript
$(function(){
var modal = $('#modal_merge_info').modal({modal: true});
$('.info_link').bind("click", function(){
modal.show();
});
$('.modal-header .close').bind("click", function(){
modal.hide();
})
})