diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-14 08:23:28 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-06-14 08:23:28 +0000 |
commit | a78cd2ecb77f2bb7bc8852a5be78a1eacc7aaf96 (patch) | |
tree | a59fb50f707a114226ea59a17a6a9a03d8cee378 /app | |
parent | 121c6322809951105d43a90e573378785b9e33a8 (diff) | |
parent | e8bf8ec40725a0af21677211f2d73d9b516c184a (diff) | |
download | gitlab-ce-a78cd2ecb77f2bb7bc8852a5be78a1eacc7aaf96.tar.gz |
Merge branch 'issue_14572' into 'master'
Add more information into RSS feed for issues
## What does this MR do?
This MR adds issue text, labels , milestone, assignee and due date into issues RSS feed.
## Are there points in the code the reviewer needs to double check?
#14572 requests to add 'weight' among other fields. Seems like issue weight is available
in enterprise edition only so it is not implemented in this MR. Please correct me if I'm wrong.
## Why was this MR needed?
This MR is needed because it extends issues RSS feed with useful information requested in
#14572.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/14572
See merge request !4158
Diffstat (limited to 'app')
-rw-r--r-- | app/views/issues/_issue.atom.builder | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/app/views/issues/_issue.atom.builder b/app/views/issues/_issue.atom.builder index 68a2d19e58d..96831874144 100644 --- a/app/views/issues/_issue.atom.builder +++ b/app/views/issues/_issue.atom.builder @@ -5,10 +5,28 @@ xml.entry do xml.updated issue.created_at.xmlschema xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email)) - xml.author do |author| + xml.author do xml.name issue.author_name xml.email issue.author_email end xml.summary issue.title + xml.description issue.description if issue.description + xml.milestone issue.milestone.title if issue.milestone + xml.due_date issue.due_date if issue.due_date + + unless issue.labels.empty? + xml.labels do + issue.labels.each do |label| + xml.label label.name + end + end + end + + if issue.assignee + xml.assignee do + xml.name issue.assignee.name + xml.email issue.assignee.email + end + end end |