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

added = preserve to some pre statements

Browse source
This commit is contained in:
Kei Kubo 2012-04-11 19:13:38 +00:00
parent 51ca0abf10
commit 700eec6672
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/errors/gitolite.html.haml
View file

@ -14,5 +14,6 @@
%p
Try:
%pre
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
= preserve do
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/

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