diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/services/discussions/unresolve_service.rb | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/services/discussions/unresolve_service.rb')
-rw-r--r-- | app/services/discussions/unresolve_service.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/services/discussions/unresolve_service.rb b/app/services/discussions/unresolve_service.rb index fbd96ceafe7..f6685b79a33 100644 --- a/app/services/discussions/unresolve_service.rb +++ b/app/services/discussions/unresolve_service.rb @@ -12,10 +12,27 @@ module Discussions end def execute + @all_discussions_resolved_before = merge_request ? @discussion.noteable.discussions_resolved? : false + @discussion.unresolve! + send_graphql_triggers + Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter .track_unresolve_thread_action(user: @user) end + + private + + def merge_request + @discussion.noteable if @discussion.for_merge_request? + end + strong_memoize_attr :merge_request + + def send_graphql_triggers + return unless merge_request && @all_discussions_resolved_before + + GraphqlTriggers.merge_request_merge_status_updated(merge_request) + end end end |