summaryrefslogtreecommitdiff
path: root/app/views/events/_event_issue.atom.haml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-06-01 15:51:59 +0000
committerDouwe Maan <douwe@gitlab.com>2016-06-01 15:51:59 +0000
commit2d084dd8481417ba8031a378d68009738d076229 (patch)
tree6c91c3ce35a66bdd1fa1d7806da51968d564ad73 /app/views/events/_event_issue.atom.haml
parentef6fe42ec05d40935154d2bb22a44fdb7d1eac8e (diff)
parent580d250166d97bd5c2b0526be737d02806e577c2 (diff)
downloadgitlab-ce-2d084dd8481417ba8031a378d68009738d076229.tar.gz
Merge branch 'separate-banzai-references' into 'master'
Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969
Diffstat (limited to 'app/views/events/_event_issue.atom.haml')
-rw-r--r--app/views/events/_event_issue.atom.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml
index fad65310021..083c3936212 100644
--- a/app/views/events/_event_issue.atom.haml
+++ b/app/views/events/_event_issue.atom.haml
@@ -1,2 +1,2 @@
%div{xmlns: "http://www.w3.org/1999/xhtml"}
- = markdown(issue.description, pipeline: :atom, project: issue.project)
+ = markdown(issue.description, pipeline: :atom, project: issue.project, author: issue.author)