diff options
| author | Kei Kubo <keikubo@gmail.com> | 2012-04-11 19:36:52 +0000 |
|---|---|---|
| committer | Kei Kubo <keikubo@gmail.com> | 2012-04-11 19:36:52 +0000 |
| commit | 42f04bf70c279f941f70c5bba547493d51a28f03 (patch) | |
| tree | 7b80c7d9287f7319b7a351d7390d518ca0447e47 | |
| parent | 700eec6672b7eeb3f8e52b802d3e3ecadd08c339 (diff) | |
| download | gitlab-ce-42f04bf70c279f941f70c5bba547493d51a28f03.tar.gz | |
bug fix: broken indents fixed in markdown rendered statements
| -rw-r--r-- | app/views/issues/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/milestones/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/notes/_show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/refs/_tree.html.haml | 3 | ||||
| -rw-r--r-- | 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 14d49305a54..37ccd9cfb64 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 bac48aa54af..38b198a9acb 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 916fda06271..77b15738610 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 389a5a9cfb9..ee2f278693c 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 1b66fd3382e..8ac4994a1b3 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 |