summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2012-02-19 22:19:31 +0200
committerValery Sizov <vsv2711@gmail.com>2012-02-19 22:19:31 +0200
commit2e1f119f2288a864ddc1ab49d2a4c47a573b47df (patch)
tree7e8ca0a1da89943cc14ea9d8fabdcc27a2f18e3f
parentd68f8401b3f0c3a9b2c887122979e83d95409a69 (diff)
downloadgitlab-ce-2e1f119f2288a864ddc1ab49d2a4c47a573b47df.tar.gz
wiki: markdown support
-rw-r--r--app/views/wikis/show.html.haml4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml
index 97e1231cbaa..5a4b904534e 100644
--- a/app/views/wikis/show.html.haml
+++ b/app/views/wikis/show.html.haml
@@ -6,6 +6,4 @@
= link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do
Edit
-= @wiki.content
-
-%br
+= markdown @wiki.content