From 51ca0abf1060e86b1f40aada80ed62b9f10833c0 Mon Sep 17 00:00:00 2001 From: Kei Kubo Date: Wed, 11 Apr 2012 10:35:49 -0700 Subject: [PATCH 1/3] bug fix: 
 indent error fixed in projects/empty.html

---
 app/views/projects/empty.html.haml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 249442c1..44411b71 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -15,7 +15,8 @@
   %h3 Git global setup:
   - setup_str = ["git config --global user.name \"#{current_user.name}\"", 
     "git config --global user.email  \"#{current_user.email}\""].join("\n")
-  = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
+  = preserve do
+    = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
 
   %br
   %br
@@ -29,7 +30,8 @@
     "git remote add origin #{@project.url_to_repo}",
     "git push -u origin master"].join("\n")
 
-  = raw bash_lexer.highlight(repo_setup_str)
+  = preserve do
+    = raw bash_lexer.highlight(repo_setup_str)
 
   %br
   %br
@@ -37,7 +39,8 @@
   - exist_repo_setup_str = ["cd existing_git_repo",
     "git remote add origin #{@project.url_to_repo}",
     "git push -u origin master"].join("\n")
-  = raw bash_lexer.highlight(exist_repo_setup_str)
+  = preserve do
+    = raw bash_lexer.highlight(exist_repo_setup_str)
 
   - if can? current_user, :admin_project, @project
     .alert-message.block-message.error.prepend-top-20

From 700eec6672b7eeb3f8e52b802d3e3ecadd08c339 Mon Sep 17 00:00:00 2001
From: Kei Kubo 
Date: Wed, 11 Apr 2012 19:13:38 +0000
Subject: [PATCH 2/3] added = preserve to some pre statements

---
 app/views/errors/gitolite.html.haml              |  5 +++--
 app/views/merge_requests/_how_to_merge.html.haml | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml
index 41d7d83a..ccee7573 100644
--- 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 61b4f0aa..af81dd5b 100644
--- 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

From 42f04bf70c279f941f70c5bba547493d51a28f03 Mon Sep 17 00:00:00 2001
From: Kei Kubo 
Date: Wed, 11 Apr 2012 19:36:52 +0000
Subject: [PATCH 3/3] bug fix: broken indents fixed in markdown rendered
 statements

---
 app/views/issues/show.html.haml     | 3 ++-
 app/views/milestones/show.html.haml | 3 ++-
 app/views/notes/_show.html.haml     | 3 ++-
 app/views/refs/_tree.html.haml      | 3 ++-
 app/views/wikis/show.html.haml      | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 14d49305..37ccd9cf 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -42,7 +42,8 @@
       
   - if @issue.description.present?
     .bottom_box_content
-      = markdown @issue.description
+      = preserve do
+        = markdown @issue.description
 
 
 .issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml
index bac48aa5..38b198a9 100644
--- a/app/views/milestones/show.html.haml
+++ b/app/views/milestones/show.html.haml
@@ -39,7 +39,8 @@
 
   - if @milestone.description.present?
     .bottom_box_content
-      = markdown @milestone.description
+      = preserve do
+        = markdown @milestone.description
 
 
 :javascript
diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml
index 916fda06..77b15738 100644
--- a/app/views/notes/_show.html.haml
+++ b/app/views/notes/_show.html.haml
@@ -9,7 +9,8 @@
       %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
 
   %div.note-title
-    = markdown(note.note)
+    = preserve do
+      = markdown(note.note)
     - if note.attachment.url
       .right
         %div.file
diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml
index 389a5a9c..ee2f2786 100644
--- a/app/views/refs/_tree.html.haml
+++ b/app/views/refs/_tree.html.haml
@@ -41,7 +41,8 @@
         %h3= content.name
         .readme
           - if content.name =~ /\.(md|markdown)$/i
-            = markdown(content.data)
+            = preserve do
+              = markdown(content.data)
           - else
             = simple_format(content.data)
 
diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml
index 1b66fd33..8ac4994a 100644
--- a/app/views/wikis/show.html.haml
+++ b/app/views/wikis/show.html.haml
@@ -8,7 +8,8 @@
         Edit
 %hr
 .wiki_content
-  = markdown_to_html @wiki.content
+  = preserve do
+    = markdown_to_html @wiki.content
 
 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
 - if can? current_user, :admin_wiki, @project