added = preserve to some pre statements

diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml
index 41d7d83..ccee757 100644 (file)
--- a/app/views/errors/gitolite.html.haml
+++ b/app/views/errors/gitolite.html.haml
@@ -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/

diff --git a/app/views/merge_requests/_how_to_merge.html.haml b/app/views/merge_requests/_how_to_merge.html.haml
index 61b4f0a..af81dd5 100644 (file)
--- a/app/views/merge_requests/_how_to_merge.html.haml
+++ b/app/views/merge_requests/_how_to_merge.html.haml
@@ -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