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

Merge pull request #667 from keikubo/master

Browse source 
The indents errors of pre blocks in haml
This commit is contained in:
Dmitriy Zaporozhets 2012-04-11 13:34:15 -07:00
commit 740e54c3fc
8 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,11 +4,12 @@
%h3 How To Merge
.modal-body
%pre
:erb
git checkout <%= @merge_request.target_branch %>
git fetch origin
git merge origin/<%= @merge_request.source_branch %>
git push origin <%= @merge_request.target_branch %>
= 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 %>
:javascript