diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 01:06:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 01:06:32 +0300 |
| commit | 15892d0271ce6e70fce3534ee12f649004ce148d (patch) | |
| tree | 60af9ae90570e987d366db3b9102d9bea4985387 /app | |
| parent | f5897da89ca63facbef54c23cff894f2bbe8e644 (diff) | |
Add latest changes from gitlab-org/security/gitlab@15-4-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8825c18ea48..3f07e1b1ec0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2159,6 +2159,10 @@ class User < ApplicationRecord (Date.current - created_at.to_date).to_i end + def webhook_email + public_email.presence || _('[REDACTED]') + end + protected # override, from Devise::Validatable |