diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-29 10:13:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-29 10:13:21 +0000 |
| commit | a2fea9288ef0a2d714827ac5b92e7330d3cb2c3f (patch) | |
| tree | c577ea5c039b21ccbb2cd42cafd2e4e2cee906de | |
| parent | f3ac2e56e72e483da192f4aea1b464e23d56f0b4 (diff) | |
| parent | 631801674f0cc6b0ccf7ba7dc8ad621d21e62105 (diff) | |
| download | gitlab-ce-a2fea9288ef0a2d714827ac5b92e7330d3cb2c3f.tar.gz | |
Merge branch 'events-atom-feed-author-query' into 'master'
Reuse authors when rendering event Atom feeds
See merge request gitlab-org/gitlab-ce!15630
| -rw-r--r-- | app/views/events/_event.atom.builder | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/events-atom-feed-author-query.yml | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder index e2aec532a9d..38741fe6662 100644 --- a/app/views/events/_event.atom.builder +++ b/app/views/events/_event.atom.builder @@ -5,7 +5,12 @@ xml.entry do xml.link href: event_feed_url(event) xml.title truncate(event_feed_title(event), length: 80) xml.updated event.updated_at.xmlschema - xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email)) + + # We're deliberately re-using "event.author" here since this data is + # eager-loaded. This allows us to re-use the user object's Email address, + # instead of having to run additional queries to figure out what Email to use + # for the avatar. + xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author)) xml.author do xml.username event.author_username diff --git a/changelogs/unreleased/events-atom-feed-author-query.yml b/changelogs/unreleased/events-atom-feed-author-query.yml new file mode 100644 index 00000000000..84c51f25de7 --- /dev/null +++ b/changelogs/unreleased/events-atom-feed-author-query.yml @@ -0,0 +1,5 @@ +--- +title: Reuse authors when rendering event Atom feeds +merge_request: +author: +type: performance |