diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 09:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 09:09:50 +0300 |
| commit | 819b5458e55523a1a03fdf16d021d2cc3479d402 (patch) | |
| tree | d2ed6ae4ceb49de29127283f7026ee26161a6829 /app/mailers/emails/admin_notification.rb | |
| parent | 83f397aaf4b871ea9c40758050d4796744d938e5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers/emails/admin_notification.rb')
| -rw-r--r-- | app/mailers/emails/admin_notification.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/admin_notification.rb b/app/mailers/emails/admin_notification.rb index e11f06d8fc9..f4540ef81a5 100644 --- a/app/mailers/emails/admin_notification.rb +++ b/app/mailers/emails/admin_notification.rb @@ -4,7 +4,7 @@ module Emails module AdminNotification def send_admin_notification(user_id, subject, body) user = User.find(user_id) - email = user.notification_email_or_default + email = user.notification_email @unsubscribe_url = unsubscribe_url(email: Base64.urlsafe_encode64(email)) @body = body mail to: email, subject: subject @@ -12,7 +12,7 @@ module Emails def send_unsubscribed_notification(user_id) user = User.find(user_id) - email = user.notification_email_or_default + email = user.notification_email mail to: email, subject: "Unsubscribed from GitLab administrator notifications" end end |