Merge pull request #667 from keikubo/master

The indents errors of pre blocks in haml

app/views/errors/gitolite.html.haml

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

app/views/issues/show.html.haml

@@ -42,6 +42,7 @@
       
   - if @issue.description.present?
     .bottom_box_content
+      = preserve do
         = markdown @issue.description
 
 

app/views/merge_requests/_how_to_merge.html.haml

@@ -4,6 +4,7 @@
     %h3 How To Merge
   .modal-body
     %pre
+      = preserve do
         :erb
           git checkout <%= @merge_request.target_branch %>
           git fetch origin

app/views/milestones/show.html.haml

@@ -39,6 +39,7 @@
 
   - if @milestone.description.present?
     .bottom_box_content
+      = preserve do
         = markdown @milestone.description
 
 

app/views/notes/_show.html.haml

@@ -9,6 +9,7 @@
       %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
 
   %div.note-title
+    = preserve do
       = markdown(note.note)
     - if note.attachment.url
       .right

app/views/projects/empty.html.haml

@@ -15,6 +15,7 @@
   %h3 Git global setup:
   - setup_str = ["git config --global user.name \"#{current_user.name}\"", 
     "git config --global user.email  \"#{current_user.email}\""].join("\n")
+  = preserve do
     = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
 
   %br
@@ -29,6 +30,7 @@
     "git remote add origin #{@project.url_to_repo}",
     "git push -u origin master"].join("\n")
 
+  = preserve do
     = raw bash_lexer.highlight(repo_setup_str)
 
   %br
@@ -37,6 +39,7 @@
   - exist_repo_setup_str = ["cd existing_git_repo",
     "git remote add origin #{@project.url_to_repo}",
     "git push -u origin master"].join("\n")
+  = preserve do
     = raw bash_lexer.highlight(exist_repo_setup_str)
 
   - if can? current_user, :admin_project, @project

app/views/refs/_tree.html.haml

@@ -41,6 +41,7 @@
         %h3= content.name
         .readme
           - if content.name =~ /\.(md|markdown)$/i
+            = preserve do
               = markdown(content.data)
           - else
             = simple_format(content.data)

app/views/wikis/show.html.haml

@@ -8,6 +8,7 @@
         Edit
 %hr
 .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}