diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 00:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 00:09:04 +0300 |
| commit | dafbc31897e3751b6a4b34a7e32e1ecf5bfd4657 (patch) | |
| tree | e454cd0c43ad4e73980cd0adb906a663faa07965 /app/services/discussions/resolve_service.rb | |
| parent | 25eb713a7fdb787a67d74a88a89433839aab5642 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/discussions/resolve_service.rb')
| -rw-r--r-- | app/services/discussions/resolve_service.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb index cd5925cd9be..91c3cf136a4 100644 --- a/app/services/discussions/resolve_service.rb +++ b/app/services/discussions/resolve_service.rb @@ -40,7 +40,13 @@ module Discussions discussion.resolve!(current_user) @resolved_count += 1 - MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(merge_request) if merge_request + if merge_request + Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter + .track_resolve_thread_action(user: current_user) + + MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(merge_request) + end + SystemNoteService.discussion_continued_in_issue(discussion, project, current_user, follow_up_issue) if follow_up_issue end |