diff options
| author | Rémy Coutable <remy@gitlab.com> | 2017-02-16 23:41:34 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-20 18:45:45 -0700 |
| commit | 153b594c06c994a8c9b4a92e9c5c33c3cdb4e0e0 (patch) | |
| tree | 7a593effaccdfcecea37f62c7ec6ed1c228270ba /app/models/event.rb | |
| parent | 770a703bd8e68601d166556124d3a4bd5b2a75da (diff) | |
| download | gitlab-ce-153b594c06c994a8c9b4a92e9c5c33c3cdb4e0e0.tar.gz | |
Merge branch '28058-hide-emails-in-atom-feeds' into 'security'
Only show public emails in atom feeds
See merge request !2066
Diffstat (limited to 'app/models/event.rb')
| -rw-r--r-- | app/models/event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index d7ca8e3c599..5c34844b5d3 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, to: :author, prefix: true, allow_nil: true + delegate :name, :email, :public_email, 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 |