diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 14d49305a541ddc3226f22238cee8db87fe641a7..37ccd9cfb6459863c674b41a8d0ca3ee365a2cf0 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 bac48aa54aff0a115497cf5e67165828f85562f5..38b198a9acb5dfb6bc051b754283243d85b90c42 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 916fda062712d52759c884181f4e346b82e195ce..77b157386105ff4259a514d32690713e01fa8647 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 389a5a9cfb9c11c6ef85a1980c53bf31d1f42552..ee2f278693c2acda2504eadb2bb7a4b854418d31 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 1b66fd3382ed188f4525616aa9d2c0cd63de67ab..8ac4994a1b3a8d62ea177b51bc52a0f9010534a1 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