From 969dc0f3fa2ec3973f75a7909ad762a220e06431 Mon Sep 17 00:00:00 2001
From: charlie ablett <cablett@gitlab.com>
Date: Tue, 25 Jan 2022 14:37:08 +1300
Subject: [PATCH] Handle multiple owners in notification service

---
 app/models/project.rb                      | 4 ++++
 ee/app/services/ee/notification_service.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 1070bb6db4f998..27ec475cc8bfa3 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1519,6 +1519,10 @@ def owner
     group || namespace.try(:owner)
   end
 
+  def owners
+    Array.wrap(owner)
+  end
+
   def first_owner
     obj = owner
 
diff --git a/ee/app/services/ee/notification_service.rb b/ee/app/services/ee/notification_service.rb
index 1feba703790eac..548a7d47297823 100644
--- a/ee/app/services/ee/notification_service.rb
+++ b/ee/app/services/ee/notification_service.rb
@@ -121,7 +121,7 @@ def user_escalation_rule_deleted_recipients(project, removed_user)
     end
 
     def incident_management_owners(project)
-      return [project.owner] unless project.group
+      return project.owners if project.personal?
 
       MembersFinder
         .new(project, nil, params: { active_without_invites_and_requests: true })
-- 
GitLab