diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-03-11 12:55:24 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-03-11 12:57:25 -0500 |
| commit | 3d078a9deecbe92fb0a465aa2ed808f0e54e9a35 (patch) | |
| tree | 997af2a684782b1822a658c88e730e4924f870c7 /app/services/notification_service.rb | |
| parent | fd85f14c6a82cfa667ec55500a4ae33478e61d2b (diff) | |
| download | gitlab-ce-3d078a9deecbe92fb0a465aa2ed808f0e54e9a35.tar.gz | |
Prevent sending an access request to a project from failing when the project has invited membersdm-mirror-hard-failed-invites
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 e07ecda27b5..ab94db2c1e5 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.owners_and_masters + recipients = member.source.members.active_without_invites.owners_and_masters if fallback_to_group_owners_masters?(recipients, member) - recipients = member.source.group.members.owners_and_masters + recipients = member.source.group.members.active_without_invites.owners_and_masters end recipients.each { |recipient| deliver_access_request_email(recipient, member) } |