3 files changed, 13 insertions, 6 deletions
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb
index cc4ad1a9c85..ea64239dd99 100644
--- a/app/services/issues/close_service.rb
+++ b/app/services/issues/close_service.rb
@@ -32,7 +32,7 @@ module Issues
 
         notification_service.async.close_issue(issue, current_user, { closed_via: closed_via }) if notifications
         todo_service.close_issue(issue, current_user)
-        resolve_alert(issue)
+        perform_incident_management_actions(issue)
         execute_hooks(issue, 'close')
         invalidate_cache_counts(issue, users: issue.assignees)
         issue.update_project_counter_caches
@@ -51,6 +51,10 @@ module Issues
 
     private
 
+    def perform_incident_management_actions(issue)
+      resolve_alert(issue)
+    end
+
     def close_external_issue(issue, closed_via)
       return unless project.external_issue_tracker&.support_close_issue?
 
@@ -89,3 +93,5 @@ module Issues
     end
   end
 end
+
+Issues::CloseService.prepend_mod_with('Issues::CloseService')
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 30d081996b1..b15b3e49c9a 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -9,11 +9,6 @@ module Issues
     # in the caller (for example, an issue created via email) and the required arguments to the
     # SpamParams constructor are not otherwise available, spam_params: must be explicitly passed as nil.
     def initialize(project:, current_user: nil, params: {}, spam_params:)
-      # Temporary check to ensure we are no longer passing request in params now that we have
-      # introduced spam_params. Raise an exception if it is present.
-      # Remove after https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58603 is complete.
-      raise if params[:request]
-
       super(project: project, current_user: current_user, params: params)
       @spam_params = spam_params
     end
diff --git a/app/services/issues/reopen_service.rb b/app/services/issues/reopen_service.rb
index e2b1b5400c7..977b924ed72 100644
--- a/app/services/issues/reopen_service.rb
+++ b/app/services/issues/reopen_service.rb
@@ -9,6 +9,7 @@ module Issues
         event_service.reopen_issue(issue, current_user)
         create_note(issue, 'reopened')
         notification_service.async.reopen_issue(issue, current_user)
+        perform_incident_management_actions(issue)
         execute_hooks(issue, 'reopen')
         invalidate_cache_counts(issue, users: issue.assignees)
         issue.update_project_counter_caches
@@ -21,8 +22,13 @@ module Issues
 
     private
 
+    def perform_incident_management_actions(issue)
+    end
+
     def create_note(issue, state = issue.state)
       SystemNoteService.change_status(issue, issue.project, current_user, state, nil)
     end
   end
 end
+
+Issues::ReopenService.prepend_mod_with('Issues::ReopenService')