How to merge instructions
This commit is contained in:
parent
94db8a1c33
commit
fa7bd43ab9
7 changed files with 388 additions and 1 deletions
Binary file not shown.
Before Width: | Height: | Size: 800 B After Width: | Height: | Size: 801 B |
|
@ -11,6 +11,7 @@
|
|||
//= require jquery.tagify
|
||||
//= require jquery.cookie
|
||||
//= require jquery.endless-scroll
|
||||
//= require bootstrap-modal
|
||||
//= require modernizr
|
||||
//= require chosen
|
||||
//= require raphael
|
||||
|
|
|
@ -313,3 +313,12 @@ img.lil_av {
|
|||
padding:10px 0;
|
||||
padding-bottom:0;
|
||||
}
|
||||
|
||||
.info_link {
|
||||
margin-right:5px;
|
||||
float:left;
|
||||
|
||||
img {
|
||||
width:20px;
|
||||
}
|
||||
}
|
||||
|
|
25
app/views/merge_requests/_how_to_merge.html.haml
Normal file
25
app/views/merge_requests/_how_to_merge.html.haml
Normal 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();
|
||||
})
|
||||
})
|
||||
|
|
@ -22,12 +22,18 @@
|
|||
.back_link
|
||||
= link_to project_merge_requests_path(@project) do
|
||||
← To merge requests
|
||||
|
||||
|
||||
%hr
|
||||
- if @merge_request.closed
|
||||
.alert-message.error Closed
|
||||
- else
|
||||
.alert-message.success Open
|
||||
.alert-message.success
|
||||
= link_to "#", :class => "info_link", :title => "How To Merge" do
|
||||
= image_tag "Info-UI.PNG"
|
||||
Open
|
||||
|
||||
= render "merge_requests/how_to_merge"
|
||||
|
||||
%div.well
|
||||
%div
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue