summaryrefslogtreecommitdiff
path: root/app/views/shared/snippets
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2015-05-13 01:54:13 +0200
committerJakub Jirutka <jakub@jirutka.cz>2015-05-18 22:52:13 +0200
commitb0659c1b072267e0e1fa3066ca1a8cc17bc8f6c0 (patch)
tree54701d5d517061602ff5ac58512268f4c18a105a /app/views/shared/snippets
parentdaa0925016a63dcde448643cbf1310aca359cf37 (diff)
downloadgitlab-ce-b0659c1b072267e0e1fa3066ca1a8cc17bc8f6c0.tar.gz
Simplify and unify helpers for rendering markup
Diffstat (limited to 'app/views/shared/snippets')
-rw-r--r--app/views/shared/snippets/_blob.html.haml6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/views/shared/snippets/_blob.html.haml b/app/views/shared/snippets/_blob.html.haml
index 30458793fd1..d26a99bb14c 100644
--- a/app/views/shared/snippets/_blob.html.haml
+++ b/app/views/shared/snippets/_blob.html.haml
@@ -1,9 +1,5 @@
- unless @snippet.content.empty?
- - if gitlab_markdown?(@snippet.file_name)
- .file-content.wiki
- = preserve do
- = markdown(@snippet.data)
- - elsif markup?(@snippet.file_name)
+ - if markup?(@snippet.file_name)
.file-content.wiki
= render_markup(@snippet.file_name, @snippet.data)
- else