summaryrefslogtreecommitdiff
path: root/app/views/issues
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2013-01-15 00:53:00 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2013-01-15 00:53:00 +0100
commitbda7fe38d0b0e39a408c4eb44374a330c24c3a49 (patch)
tree232212b8827c5be94da672287e3209c8e8f9f18a /app/views/issues
parentd28176b132bdc74055f31e2d62665d5d74ebacb4 (diff)
parentd8e697ac68d758d4f451594047056c459f546bf7 (diff)
downloadgitlab-ce-bda7fe38d0b0e39a408c4eb44374a330c24c3a49.tar.gz
Merge branch 'master' into discussions
Diffstat (limited to 'app/views/issues')
-rw-r--r--app/views/issues/show.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 55fc0aee0df..6bf78929699 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -51,8 +51,9 @@
- if @issue.description.present?
.ui-box-bottom
- = preserve do
- = markdown @issue.description
+ .wiki
+ = preserve do
+ = markdown @issue.description
.voting_notes#notes= render "notes/notes_with_form"