Add latest changes from gitlab-org/gitlab@12-5-stable-ee

2 files changed, 17 insertions, 0 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index c136803ef3b..9e6cbfa06fe 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -42,6 +42,10 @@ module Notes
         clear_noteable_diffs_cache(note)
         Suggestions::CreateService.new(note).execute
         increment_usage_counter(note)
+
+        if Feature.enabled?(:notes_create_service_tracking, project)
+          Gitlab::Tracking.event('Notes::CreateService', 'execute', tracking_data_for(note))
+        end
       end
 
       if quick_actions_service.commands_executed_count.to_i > 0
@@ -59,5 +63,16 @@ module Notes
 
       note
     end
+
+    private
+
+    def tracking_data_for(note)
+      label = Gitlab.ee? && note.author == User.visual_review_bot ? 'anonymous_visual_review_note' : 'note'
+
+      {
+        label: label,
+        value: note.id
+      }
+    end
   end
 end
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index 48722cc2a79..53b3b57f4af 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -35,3 +35,5 @@ module Notes
     end
   end
 end
+
+Notes::PostProcessService.prepend_if_ee('EE::Notes::PostProcessService')