diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-21 00:10:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-21 00:10:36 +0300 |
| commit | 3867f4726590bd73909adbc51a71f6399aa1b6dc (patch) | |
| tree | 603bd159fc15b9ddb9896aa1e01e38c8957b0990 /app/services/suggestions | |
| parent | bca3fb69e1e43c345ccac26a08ae1d374920020d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/suggestions')
| -rw-r--r-- | app/services/suggestions/apply_service.rb | 2 | ||||
| -rw-r--r-- | app/services/suggestions/create_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/suggestions/apply_service.rb b/app/services/suggestions/apply_service.rb index 6836700a67d..a0d26e08341 100644 --- a/app/services/suggestions/apply_service.rb +++ b/app/services/suggestions/apply_service.rb @@ -33,7 +33,7 @@ module Suggestions .update_all(commit_id: result[:result], applied: true) Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter - .track_apply_suggestion_action(user: current_user) + .track_apply_suggestion_action(user: current_user, suggestions: suggestion_set.suggestions) end def author diff --git a/app/services/suggestions/create_service.rb b/app/services/suggestions/create_service.rb index c5f9fa1eee0..eb98ed57d55 100644 --- a/app/services/suggestions/create_service.rb +++ b/app/services/suggestions/create_service.rb @@ -28,7 +28,7 @@ module Suggestions Gitlab::Database.main.bulk_insert('suggestions', rows) # rubocop:disable Gitlab/BulkInsert end - Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter.track_add_suggestion_action(user: @note.author) + Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter.track_add_suggestion_action(note: @note) end end end |