Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@gitlab.com>2017-02-17 02:41:34 +0300
committerDJ Mountney <david@twkie.net>2017-03-21 04:45:45 +0300
commit153b594c06c994a8c9b4a92e9c5c33c3cdb4e0e0 (patch)
tree7a593effaccdfcecea37f62c7ec6ed1c228270ba /app/views/issues
parent770a703bd8e68601d166556124d3a4bd5b2a75da (diff)
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/views/issues')
-rw-r--r--app/views/issues/_issue.atom.builder4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/issues/_issue.atom.builder b/app/views/issues/_issue.atom.builder
index fcd30c8c765..23a88448055 100644
--- a/app/views/issues/_issue.atom.builder
+++ b/app/views/issues/_issue.atom.builder
@@ -7,7 +7,7 @@ xml.entry do
xml.author do
xml.name issue.author_name
- xml.email issue.author_email
+ xml.email issue.author_public_email
end
xml.summary issue.title
@@ -26,7 +26,7 @@ xml.entry do
if issue.assignee
xml.assignee do
xml.name issue.assignee.name
- xml.email issue.assignee.email
+ xml.email issue.assignee_public_email
end
end
end