diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-30 07:47:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-30 07:47:32 +0300 |
| commit | 1f6654659564013b8aa4f3572158cb63d3a519c1 (patch) | |
| tree | 0db2ae38308cb4ce7c7f33bfc670e228ea2be1e7 /lib | |
| parent | d7437af3f31f388bf59b23a06c9bff5c8c5fd157 (diff) | |
Add latest changes from gitlab-org/security/gitlab@15-6-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/hook_data/project_builder.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/hook_data/project_member_builder.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/hook_data/project_builder.rb b/lib/gitlab/hook_data/project_builder.rb index ebd97d3ab1b..aec842e061f 100644 --- a/lib/gitlab/hook_data/project_builder.rb +++ b/lib/gitlab/hook_data/project_builder.rb @@ -57,7 +57,7 @@ module Gitlab end def user_email(user) - user.respond_to?(:email) ? user.email : "" + user.respond_to?(:webhook_email) ? user.webhook_email : "" end def event_specific_project_data(event) diff --git a/lib/gitlab/hook_data/project_member_builder.rb b/lib/gitlab/hook_data/project_member_builder.rb index 2ee61705ec1..be5bde356de 100644 --- a/lib/gitlab/hook_data/project_member_builder.rb +++ b/lib/gitlab/hook_data/project_member_builder.rb @@ -43,7 +43,7 @@ module Gitlab project_id: project.id, user_username: project_member.user.username, user_name: project_member.user.name, - user_email: project_member.user.email, + user_email: project_member.user.webhook_email, user_id: project_member.user.id, access_level: project_member.human_access, project_visibility: project.visibility |