From 1b5891ee8ce8adc6877c462ea292eaee3c4ab30b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 15 Aug 2022 03:11:57 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/notes/create_service.rb | 3 ++- app/services/notes/destroy_service.rb | 3 ++- app/services/notes/update_service.rb | 3 ++- app/services/system_notes/issuables_service.rb | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'app/services') diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 90edeacf633..b7e6a50fa5c 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -147,7 +147,8 @@ module Notes end def track_note_creation_usage_for_issues(note) - Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_comment_added_action(author: note.author) + Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_comment_added_action(author: note.author, + project: project) end def track_note_creation_usage_for_merge_requests(note) diff --git a/app/services/notes/destroy_service.rb b/app/services/notes/destroy_service.rb index c25b1ab0379..eda8bbcbc2e 100644 --- a/app/services/notes/destroy_service.rb +++ b/app/services/notes/destroy_service.rb @@ -15,7 +15,8 @@ module Notes private def track_note_removal_usage_for_issues(note) - Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_comment_removed_action(author: note.author) + Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_comment_removed_action(author: note.author, + project: project) end def track_note_removal_usage_for_merge_requests(note) diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb index 04fc4c7c944..2dae76feb0b 100644 --- a/app/services/notes/update_service.rb +++ b/app/services/notes/update_service.rb @@ -86,7 +86,8 @@ module Notes end def track_note_edit_usage_for_issues(note) - Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_comment_edited_action(author: note.author) + Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_comment_edited_action(author: note.author, + project: project) end def track_note_edit_usage_for_merge_requests(note) diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb index d2c6e9890db..1c724df44da 100644 --- a/app/services/system_notes/issuables_service.rb +++ b/app/services/system_notes/issuables_service.rb @@ -327,7 +327,9 @@ module SystemNotes cross_reference = noteable_ref.to_reference(project) body = "cloned #{direction} #{cross_reference}" - issue_activity_counter.track_issue_cloned_action(author: author) if noteable.is_a?(Issue) && direction == :to + if noteable.is_a?(Issue) && direction == :to + issue_activity_counter.track_issue_cloned_action(author: author, project: project) + end create_note(NoteSummary.new(noteable, project, author, body, action: 'cloned', created_at: created_at)) end -- cgit v1.2.1