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

1. Better message if no ssh key

Browse source 
2. SSH Keys Help page
This commit is contained in:
Dmitriy Zaporozhets 2012-08-22 03:56:53 +03:00
parent 5c7ed6fa26
commit aa50408ecb
15 changed files with 104 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/views/merge_requests/show/_how_to_merge.html.haml
View file

@ -3,13 +3,12 @@
%a.close{href: "#"} ×
%h3 How To Merge
.modal-body
%pre
%pre.dark
= 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 %>
git checkout #{@merge_request.target_branch}
git fetch origin
git merge origin/#{@merge_request.source_branch}
git push origin #{@merge_request.target_branch}
:javascript