summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Lee <mattl@gitlab.com>2016-11-22 17:24:59 -0500
committerMatt Lee <mattl@gitlab.com>2016-11-22 17:24:59 -0500
commit45b7eb6177726d7aea6440ed4849061b560e6dd1 (patch)
tree65f65da8e0f00b442e94cf5785a032b01bf03e0c
parent1fc21ed838fc14401e8acb5bf761bcbf459d9a2c (diff)
downloadgitlab-ce-24837-fix-atom-bug.tar.gz
Hides the email address from the atom feed when no public email address is shown on the user profile24837-fix-atom-bug
-rw-r--r--app/views/events/_event.atom.builder4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder
index 7890e717aa7..c26e0269fe4 100644
--- a/app/views/events/_event.atom.builder
+++ b/app/views/events/_event.atom.builder
@@ -9,7 +9,9 @@ xml.entry do
xml.author do
xml.name event.author_name
- xml.email event.author_email
+ unless @user.public_email.blank?
+ xml.email event.author_email
+ end
end
xml.summary(type: "xhtml") do |summary|