Skip to content
Snippets Groups Projects
Commit 2c358a05 authored by winniehell's avatar winniehell
Browse files

Add username to activity atom feed (!10802)

parent 43fb9279
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
---
title: Add username to activity atom feed
merge_request: 10802
author: winniehell
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment