diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-07 12:09:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-07 12:09:35 +0000 |
commit | 414fefc8c437ab2e4dc768e675d0e914241c06bc (patch) | |
tree | 0bd0ce5efb62568829210ae6a039c4d8f2638b33 /app/models/notification_recipient.rb | |
parent | 2a296e6d58ee5da98c8da39dab93cb4c5537139d (diff) | |
download | gitlab-ce-414fefc8c437ab2e4dc768e675d0e914241c06bc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/notification_recipient.rb')
-rw-r--r-- | app/models/notification_recipient.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb index caa24377791..20d5a5ae1a1 100644 --- a/app/models/notification_recipient.rb +++ b/app/models/notification_recipient.rb @@ -97,8 +97,6 @@ class NotificationRecipient end def email_blocked? - return false if Feature.disabled?(:block_emails_with_failures) - recipient_email = user.notification_email_for(@group) Gitlab::ApplicationRateLimiter.peek(:permanent_email_failure, scope: recipient_email) || |