Commit 700eec6672b7eeb3f8e52b802d3e3ecadd08c339
1 parent
51ca0abf
Exists in
master
and in
4 other branches
added = preserve to some pre statements
Showing
2 changed files
with
9 additions
and
7 deletions
Show diff stats
app/views/errors/gitolite.html.haml
app/views/merge_requests/_how_to_merge.html.haml
@@ -4,11 +4,12 @@ | @@ -4,11 +4,12 @@ | ||
4 | %h3 How To Merge | 4 | %h3 How To Merge |
5 | .modal-body | 5 | .modal-body |
6 | %pre | 6 | %pre |
7 | - :erb | ||
8 | - git checkout <%= @merge_request.target_branch %> | ||
9 | - git fetch origin | ||
10 | - git merge origin/<%= @merge_request.source_branch %> | ||
11 | - git push origin <%= @merge_request.target_branch %> | 7 | + = preserve do |
8 | + :erb | ||
9 | + git checkout <%= @merge_request.target_branch %> | ||
10 | + git fetch origin | ||
11 | + git merge origin/<%= @merge_request.source_branch %> | ||
12 | + git push origin <%= @merge_request.target_branch %> | ||
12 | 13 | ||
13 | 14 | ||
14 | :javascript | 15 | :javascript |