diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 18:24:04 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 18:24:07 +0300 |
| commit | df28ee36a60d759ff632bc6aa44cdc133ee8d370 (patch) | |
| tree | e7c13592d8a17cb412974c47fa1802ad9081f8c9 /lib | |
| parent | e75d83d8544327168116a8bb47379e84885f8258 (diff) | |
Merge branch 'security-fix-user-email-tag-push-leak-11-7' into 'security-11-7'
[11.7] Security fix user email tag push leak
See merge request gitlab/gitlabhq!2809
(cherry picked from commit f59786036d65a881370073d55f8ab531405d3093)
cbfa6282 Prefer build() rather than create()
d34ea609 Fix private user email being visible in tag webhooks
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/data_builder/push.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/data_builder/push.rb b/lib/gitlab/data_builder/push.rb index 862127110b9..ea08b5f7eae 100644 --- a/lib/gitlab/data_builder/push.rb +++ b/lib/gitlab/data_builder/push.rb @@ -93,7 +93,7 @@ module Gitlab user_id: user.id, user_name: user.name, user_username: user.username, - user_email: user.email, + user_email: user.public_email, user_avatar: user.avatar_url(only_path: false), project_id: project.id, project: project.hook_attrs, |