Download as
Browse Code »

Commit 42f04bf70c279f941f70c5bba547493d51a28f03

Authored by Kei Kubo
1 parent 700eec66
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

bug fix: broken indents fixed in markdown rendered statements

Showing 5 changed files with 10 additions and 5 deletions   Show diff stats
app/views/issues/show.html.haml
  Diff comments   View file @42f04bf
@@ -42,7 +42,8 @@ @@ -42,7 +42,8 @@
42 42
43 - if @issue.description.present? 43 - if @issue.description.present?
44 .bottom_box_content 44 .bottom_box_content
45 - = markdown @issue.description 45 + = preserve do
  46 + = markdown @issue.description
46 47
47 48
48 .issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue" 49 .issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
app/views/milestones/show.html.haml
  Diff comments   View file @42f04bf
@@ -39,7 +39,8 @@ @@ -39,7 +39,8 @@
39 39
40 - if @milestone.description.present? 40 - if @milestone.description.present?
41 .bottom_box_content 41 .bottom_box_content
42 - = markdown @milestone.description 42 + = preserve do
  43 + = markdown @milestone.description
43 44
44 45
45 :javascript 46 :javascript
app/views/notes/_show.html.haml
  Diff comments   View file @42f04bf
@@ -9,7 +9,8 @@ @@ -9,7 +9,8 @@
9 %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small" 9 %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
10 10
11 %div.note-title 11 %div.note-title
12 - = markdown(note.note) 12 + = preserve do
  13 + = markdown(note.note)
13 - if note.attachment.url 14 - if note.attachment.url
14 .right 15 .right
15 %div.file 16 %div.file
app/views/refs/_tree.html.haml
  Diff comments   View file @42f04bf
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
41 %h3= content.name 41 %h3= content.name
42 .readme 42 .readme
43 - if content.name =~ /\.(md|markdown)$/i 43 - if content.name =~ /\.(md|markdown)$/i
44 - = markdown(content.data) 44 + = preserve do
  45 + = markdown(content.data)
45 - else 46 - else
46 = simple_format(content.data) 47 = simple_format(content.data)
47 48
app/views/wikis/show.html.haml
  Diff comments   View file @42f04bf
@@ -8,7 +8,8 @@ @@ -8,7 +8,8 @@
8 Edit 8 Edit
9 %hr 9 %hr
10 .wiki_content 10 .wiki_content
11 - = markdown_to_html @wiki.content 11 + = preserve do
  12 + = markdown_to_html @wiki.content
12 13
13 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at} 14 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
14 - if can? current_user, :admin_wiki, @project 15 - if can? current_user, :admin_wiki, @project