Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/app/services/notification_recipients/builder/base.rb b/app/services/notification_recipients/builder/base.rb
index 4f1bb0dc877..0a7f25f1af3 100644
--- a/app/services/notification_recipients/builder/base.rb
+++ b/app/services/notification_recipients/builder/base.rb
@@ -47,6 +47,8 @@ module NotificationRecipients
         end
 
         users = Array(users).compact
+        preload_users_namespace_bans(users)
+
         recipients.concat(users.map { |u| make_recipient(u, type, reason) })
       end
       # rubocop: enable CodeReuse/ActiveRecord
@@ -240,6 +242,14 @@ module NotificationRecipients
           add_recipients(label.subscribers(project), :subscription, NotificationReason::SUBSCRIBED)
         end
       end
+
+      private
+
+      def preload_users_namespace_bans(_users)
+        # overridden in EE
+      end
     end
   end
 end
+
+NotificationRecipients::Builder::Base.prepend_mod_with('NotificationRecipients::Builder::Base')