diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-03-21 16:14:32 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-03-21 16:14:32 +0000 |
| commit | 15a72e05f53a8469eaa577e225a405b0ea02e08b (patch) | |
| tree | 232b7aaf88a1b05225febfc3af5b3f65fb175d81 /app/services/notification_service.rb | |
| parent | 40c338a4bbcfbcb1da0a54acfdf730f6bae6763f (diff) | |
| download | gitlab-ce-15a72e05f53a8469eaa577e225a405b0ea02e08b.tar.gz | |
Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CEee-5063-to-ce-backport
Diffstat (limited to 'app/services/notification_service.rb')
| -rw-r--r-- | app/services/notification_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index ab94db2c1e5..d7d2cde1004 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -208,9 +208,9 @@ class NotificationService def new_access_request(member) return true unless member.notifiable?(:subscription) - recipients = member.source.members.active_without_invites.owners_and_masters + recipients = member.source.members.active_without_invites_and_requests.owners_and_masters if fallback_to_group_owners_masters?(recipients, member) - recipients = member.source.group.members.active_without_invites.owners_and_masters + recipients = member.source.group.members.active_without_invites_and_requests.owners_and_masters end recipients.each { |recipient| deliver_access_request_email(recipient, member) } |