Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 9 insertions, 0 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 4f2329a42f2..e26f662a697 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -2,6 +2,8 @@
 
 module Notes
   class CreateService < ::Notes::BaseService
+    include IncidentManagement::UsageData
+
     def execute
       note = Notes::BuildService.new(project, current_user, params.except(:merge_request_diff_head_sha)).execute
 
@@ -62,6 +64,7 @@ module Notes
       clear_noteable_diffs_cache(note)
       Suggestions::CreateService.new(note).execute
       increment_usage_counter(note)
+      track_event(note, current_user)
 
       if Feature.enabled?(:notes_create_service_tracking, project)
         Gitlab::Tracking.event('Notes::CreateService', 'execute', tracking_data_for(note))
@@ -104,5 +107,11 @@ module Notes
         value: note.id
       }
     end
+
+    def track_event(note, user)
+      return unless note.noteable.is_a?(Issue) && note.noteable.incident?
+
+      track_usage_event(:incident_management_incident_comment, user.id)
+    end
   end
 end