Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

2 files changed, 8 insertions, 2 deletions

diff --git a/app/services/suggestions/apply_service.rb b/app/services/suggestions/apply_service.rb
index ab80b23a37b..f9783f4271f 100644
--- a/app/services/suggestions/apply_service.rb
+++ b/app/services/suggestions/apply_service.rb
@@ -2,8 +2,9 @@
 
 module Suggestions
   class ApplyService < ::BaseService
-    def initialize(current_user, *suggestions)
+    def initialize(current_user, *suggestions, message: nil)
       @current_user = current_user
+      @message = message
       @suggestion_set = Gitlab::Suggestions::SuggestionSet.new(suggestions)
     end
 
@@ -30,6 +31,9 @@ module Suggestions
 
       Suggestion.id_in(suggestion_set.suggestions)
         .update_all(commit_id: result[:result], applied: true)
+
+      Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter
+        .track_apply_suggestion_action(user: current_user)
     end
 
     def multi_service
@@ -44,7 +48,7 @@ module Suggestions
     end
 
     def commit_message
-      Gitlab::Suggestions::CommitMessage.new(current_user, suggestion_set).message
+      Gitlab::Suggestions::CommitMessage.new(current_user, suggestion_set, @message).message
     end
   end
 end
diff --git a/app/services/suggestions/create_service.rb b/app/services/suggestions/create_service.rb
index 93d2bd11426..a97c36fa0ca 100644
--- a/app/services/suggestions/create_service.rb
+++ b/app/services/suggestions/create_service.rb
@@ -27,6 +27,8 @@ module Suggestions
       rows.in_groups_of(100, false) do |rows|
         Gitlab::Database.bulk_insert('suggestions', rows) # rubocop:disable Gitlab/BulkInsert
       end
+
+      Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter.track_add_suggestion_action(user: @note.author)
     end
   end
 end