summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-07-26 05:26:03 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-07-26 05:26:03 +0000
commit08c03e7e17c090861f8ab9336ee71bbac78eaab3 (patch)
tree11d04d58c7a16e54bb6b3fa97df962309e6c84ed /app/services
parent760f7c6216e48b6dbd474aa684f1112020c3fb03 (diff)
parent10a42a8a76c281fad735f89cb3c37caf2acd6e04 (diff)
downloadgitlab-ce-08c03e7e17c090861f8ab9336ee71bbac78eaab3.tar.gz
Merge branch '63568-access-email-notifications-custom-email' into 'master'
Respect alt email when sending group access notifications See merge request gitlab-org/gitlab-ce!31089
Diffstat (limited to 'app/services')
-rw-r--r--app/services/notification_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index a55771ed538..21fab22e0d4 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -595,7 +595,7 @@ class NotificationService
end
def deliver_access_request_email(recipient, member)
- mailer.member_access_requested_email(member.real_source_type, member.id, recipient.user.notification_email).deliver_later
+ mailer.member_access_requested_email(member.real_source_type, member.id, recipient.user.id).deliver_later
end
def fallback_to_group_owners_maintainers?(recipients, member)