diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-27 10:30:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-27 10:30:17 +0000 |
| commit | 025b04f3e7976ac8829e24fcb587d86574b0037d (patch) | |
| tree | 0bb50cb4762b8b9efbdbbd971635923e3bf0b0e0 | |
| parent | 2df748aa71d6c636c82ed2a0a8dde8ebf6bfc7f2 (diff) | |
| parent | 2c358a052e8cf23d4815221940b6e342d1b54ff5 (diff) | |
| download | gitlab-ce-025b04f3e7976ac8829e24fcb587d86574b0037d.tar.gz | |
Merge branch 'add-username-to-activity-feed' into 'master'
Add username to activity atom feed
Closes #31268
See merge request !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 |