Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb b/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb
index 6aeeb1d31aa..cbc4f126293 100644
--- a/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb
+++ b/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb
@@ -19,7 +19,7 @@ module Gitlab
             "**Incident key:** #{incident_payload['incident_key']}",
             "**Created at:** #{markdown_incident_created_at}",
             "**Assignees:** #{markdown_assignees.join(', ')}",
-            "**Impacted services:** #{markdown_impacted_services.join(', ')}"
+            "**Impacted service:** #{markdown_impacted_service}"
           ].join(markdown_line_break)
         end
 
@@ -47,10 +47,9 @@ module Gitlab
           end
         end
 
-        def markdown_impacted_services
-          Array(incident_payload['impacted_services']).map do |is|
-            markdown_link(is['summary'], is['url'])
-          end
+        def markdown_impacted_service
+          service = incident_payload['impacted_service']
+          markdown_link(service['summary'], service['url']) unless service.nil?
         end
 
         def markdown_link(label, url)