Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 11 insertions, 1 deletions

diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb
index 10407e99715..553fb6e2ac9 100644
--- a/app/services/issues/base_service.rb
+++ b/app/services/issues/base_service.rb
@@ -97,6 +97,16 @@ module Issues
       hooks_scope = issue.confidential? ? :confidential_issue_hooks : :issue_hooks
       issue.project.execute_hooks(issue_data, hooks_scope)
       issue.project.execute_integrations(issue_data, hooks_scope)
+
+      execute_incident_hooks(issue, issue_data) if issue.incident?
+    end
+
+    # We can remove this code after proposal in
+    # https://gitlab.com/gitlab-org/gitlab/-/issues/367550#proposal is updated.
+    def execute_incident_hooks(issue, issue_data)
+      issue_data[:object_kind] = 'incident'
+      issue_data[:event_type] = 'incident'
+      issue.project.execute_integrations(issue_data, :incident_hooks)
     end
 
     def update_project_counter_caches?(issue)
@@ -117,7 +127,7 @@ module Issues
 
     override :allowed_create_params
     def allowed_create_params(params)
-      super(params).except(:issue_type, :work_item_type_id, :work_item_type)
+      super(params).except(:work_item_type_id, :work_item_type)
     end
   end
 end