diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-26 18:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-26 18:08:51 +0300 |
commit | a3a9c1103b0f023deafc9fc9307032085419ff7d (patch) | |
tree | d4c73cc6e63e4ba79b1a854a747142e02dd4250d /app/services/notification_service.rb | |
parent | 597d5ed08988cb00681eaf252d04ebae4bd24731 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/notification_service.rb')
-rw-r--r-- | app/services/notification_service.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index ceafebddfcf..648067e3452 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -345,8 +345,12 @@ class NotificationService def review_requested_of_merge_request(merge_request, current_user, reviewer) recipients = NotificationRecipients::BuildService.build_requested_review_recipients(merge_request, current_user, reviewer) + deliver_option = review_request_deliver_options(merge_request.project, reviewer) + recipients.each do |recipient| - mailer.request_review_merge_request_email(recipient.user.id, merge_request.id, current_user.id, recipient.reason).deliver_later + mailer + .request_review_merge_request_email(recipient.user.id, merge_request.id, current_user.id, recipient.reason) + .deliver_later(deliver_option) end end @@ -960,6 +964,11 @@ class NotificationService # Overridden in EE {} end + + def review_request_deliver_options(project, user) + # Overridden in EE + {} + end end NotificationService.prepend_mod_with('NotificationService') |