Merge branch 'add-username-to-activity-feed' into 'master'

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

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

changelogs/unreleased/add-username-to-activity-feed.yml

+---
+title: Add username to activity atom feed
+merge_request: 10802
+author: winniehell