diff options
| author | winniehell <git@winniehell.de> | 2017-04-20 02:04:56 +0300 |
|---|---|---|
| committer | winniehell <git@winniehell.de> | 2017-04-27 00:21:30 +0300 |
| commit | 2c358a052e8cf23d4815221940b6e342d1b54ff5 (patch) | |
| tree | 535c61425834e9de6df1e8fb3cf4ace31cc8f1a0 | |
| parent | 43fb9279ce39d51b1deceb5108560bf37b8d340d (diff) | |
Add username to activity atom feed (!10802)
| -rw-r--r-- | app/models/event.rb | 2 | ||||
| -rw-r--r-- | app/views/events/_event.atom.builder | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/add-username-to-activity-feed.yml | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 5c34844b5d3..b780c1faf81 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -16,7 +16,7 @@ class Event < ActiveRecord::Base RESET_PROJECT_ACTIVITY_INTERVAL = 1.hour - delegate :name, :email, :public_email, to: :author, prefix: true, allow_nil: true + delegate :name, :email, :public_email, :username, to: :author, prefix: true, allow_nil: true delegate :title, to: :issue, prefix: true, allow_nil: true delegate :title, to: :merge_request, prefix: true, allow_nil: true delegate :title, to: :note, prefix: true, allow_nil: true diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder index 158061579f6..e2aec532a9d 100644 --- a/app/views/events/_event.atom.builder +++ b/app/views/events/_event.atom.builder @@ -8,6 +8,7 @@ xml.entry do xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email)) xml.author do + xml.username event.author_username xml.name event.author_name xml.email event.author_public_email end diff --git a/changelogs/unreleased/add-username-to-activity-feed.yml b/changelogs/unreleased/add-username-to-activity-feed.yml new file mode 100644 index 00000000000..f4c216a3954 --- /dev/null +++ b/changelogs/unreleased/add-username-to-activity-feed.yml @@ -0,0 +1,4 @@ +--- +title: Add username to activity atom feed +merge_request: 10802 +author: winniehell |