summaryrefslogtreecommitdiff
path: root/app/models/event.rb
diff options
context:
space:
mode:
authorwinniehell <git@winniehell.de>2017-04-20 01:04:56 +0200
committerwinniehell <git@winniehell.de>2017-04-26 23:21:30 +0200
commit2c358a052e8cf23d4815221940b6e342d1b54ff5 (patch)
tree535c61425834e9de6df1e8fb3cf4ace31cc8f1a0 /app/models/event.rb
parent43fb9279ce39d51b1deceb5108560bf37b8d340d (diff)
downloadgitlab-ce-2c358a052e8cf23d4815221940b6e342d1b54ff5.tar.gz
Add username to activity atom feed (!10802)
Diffstat (limited to 'app/models/event.rb')
-rw-r--r--app/models/event.rb2
1 files changed, 1 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