Automatic merge of gitlab-org/gitlab-ce master

ff774a16 · GitLab Bot · 276ae4aa · 3a963cd9 · ff774a16 · ff774a16
Commit ff774a16 authored May 22, 2019 by GitLab Bot
Showing with 6 additions and 0 deletions

app/views/issues/_issue.atom.builder app/views/issues/_issue.atom.builder +1 -0

changelogs/unreleased/13453_minimal_atom_fix.yml changelogs/unreleased/13453_minimal_atom_fix.yml +5 -0

No files found.
--- a/app/views/issues/_issue.atom.builder
+++ b/app/views/issues/_issue.atom.builder
@@ -12,6 +12,7 @@ xml.entry do

  xml.summary issue.title
  xml.description issue.description if issue.description
+  xml.content issue.description if issue.description
  xml.milestone issue.milestone.title if issue.milestone
  xml.due_date issue.due_date if issue.due_date


--- a/changelogs/unreleased/13453_minimal_atom_fix.yml
+++ b/changelogs/unreleased/13453_minimal_atom_fix.yml
+---
+title: Added a content field to atom feed
+merge_request: 27652
+author:
+type: fixed