diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-01 00:07:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-01 00:07:13 +0000 |
| commit | ba557e8fea7c8a825a702ab154fa1574c4d2998a (patch) | |
| tree | 9c252889816492ea0ebc5c7f86b1f5cd4a2f3620 /lib/gitlab/hook_data | |
| parent | d88cacce3f205151867ab3f9297f10cdae4a7025 (diff) | |
| download | gitlab-ce-ba557e8fea7c8a825a702ab154fa1574c4d2998a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/hook_data')
| -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 |