diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 18:24:10 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 18:24:12 +0300 |
| commit | 9149beee1b363fbceec7c48a51a4e85ba19d06a5 (patch) | |
| tree | 0c4bf8805a31d464dd4a4bb69e602bb3a589c5af /lib | |
| parent | 0270de55ca6d4ddb0d0d67f98309d0f1ba2b9cef (diff) | |
Merge branch 'security-fix-user-email-tag-push-leak-11-6' into 'security-11-6'
[11.6] Security fix user email tag push leak
See merge request gitlab/gitlabhq!2808
(cherry picked from commit 7260e6e0c2ad3df7dea2c0bd5c0d91c4bc5b15ae)
589c57c7 Prefer build() rather than create()
63d13410 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 9bf2f9291a8..c19e084964f 100644 --- a/lib/gitlab/data_builder/push.rb +++ b/lib/gitlab/data_builder/push.rb @@ -87,7 +87,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, |