Add latest changes from gitlab-org/gitlab@master

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')