summaryrefslogtreecommitdiff
path: root/app/views/events/_event_merge_request.atom.haml
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-03 16:38:35 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-03 16:38:35 -0400
commit4bd92e681e0a6d2a8d7e1ef44d9f248394833d09 (patch)
treedbd9edc770742f1404768232b6c4aa943eef467b /app/views/events/_event_merge_request.atom.haml
parente5d89c1084d1c1f29bfabe50718debf8867f760e (diff)
downloadgitlab-ce-4bd92e681e0a6d2a8d7e1ef44d9f248394833d09.tar.gz
Return early from markdown and gfm when text is empty
Diffstat (limited to 'app/views/events/_event_merge_request.atom.haml')
-rw-r--r--app/views/events/_event_merge_request.atom.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml
index e8ed13df783..db2b3550c49 100644
--- a/app/views/events/_event_merge_request.atom.haml
+++ b/app/views/events/_event_merge_request.atom.haml
@@ -1,3 +1,2 @@
%div{xmlns: "http://www.w3.org/1999/xhtml"}
- - if merge_request.description.present?
- = markdown(merge_request.description, xhtml: true, reference_only_path: false, project: merge_request.project)
+ = markdown(merge_request.description, xhtml: true, reference_only_path: false, project: merge_request.project)