Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 06:10:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 06:10:21 +0300
commit3e7f2f00ca92b26d631009c5f45986500a27024b (patch)
treef91f6c4dc97a762a58190b4bb9ea355e2fc2cd7c /app/services/discussions/resolve_service.rb
parenta160c4b1a72105a751cdc2f9f973dbe39a1c0dfd (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.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb
index 91c3cf136a4..3b733023eae 100644
--- a/app/services/discussions/resolve_service.rb
+++ b/app/services/discussions/resolve_service.rb
@@ -44,7 +44,7 @@ module Discussions
Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter
.track_resolve_thread_action(user: current_user)
- MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(merge_request)
+ MergeRequests::ResolvedDiscussionNotificationService.new(project: project, current_user: current_user).execute(merge_request)
end
SystemNoteService.discussion_continued_in_issue(discussion, project, current_user, follow_up_issue) if follow_up_issue