diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-05 09:09:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-05 09:09:10 +0000 |
| commit | 187727e24865494570a0d0e162a9f44e721aacde (patch) | |
| tree | dc0467d2ed463e7339f6873f9a23844bb70b79e5 /app/services | |
| parent | b4d76c5ac78ec9f690e2094fbf5f77331b9432c8 (diff) | |
| download | gitlab-ce-187727e24865494570a0d0e162a9f44e721aacde.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 6 | ||||
| -rw-r--r-- | app/services/merge_requests/mark_reviewer_reviewed_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/request_review_service.rb | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index a848053ecaf..cfd7c645b7e 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -58,7 +58,7 @@ module MergeRequests new_reviewers = merge_request.reviewers - old_reviewers merge_request_activity_counter.track_users_review_requested(users: new_reviewers) merge_request_activity_counter.track_reviewers_changed_action(user: current_user) - GraphqlTriggers.merge_request_reviewers_updated(merge_request) + trigger_merge_request_reviewers_updated(merge_request) end def cleanup_environments(merge_request) @@ -245,6 +245,10 @@ module MergeRequests Milestones::MergeRequestsCountService.new(milestone).delete_cache end + + def trigger_merge_request_reviewers_updated(merge_request) + GraphqlTriggers.merge_request_reviewers_updated(merge_request) + end end end diff --git a/app/services/merge_requests/mark_reviewer_reviewed_service.rb b/app/services/merge_requests/mark_reviewer_reviewed_service.rb index 766a4ca0a49..96747eabcf6 100644 --- a/app/services/merge_requests/mark_reviewer_reviewed_service.rb +++ b/app/services/merge_requests/mark_reviewer_reviewed_service.rb @@ -10,6 +10,8 @@ module MergeRequests if reviewer return error("Failed to update reviewer") unless reviewer.update(state: :reviewed) + trigger_merge_request_reviewers_updated(merge_request) + success else error("Reviewer not found") diff --git a/app/services/merge_requests/request_review_service.rb b/app/services/merge_requests/request_review_service.rb index b061ed45fee..ebbae98352b 100644 --- a/app/services/merge_requests/request_review_service.rb +++ b/app/services/merge_requests/request_review_service.rb @@ -11,6 +11,7 @@ module MergeRequests return error("Failed to update reviewer") unless reviewer.update(state: :unreviewed) notify_reviewer(merge_request, user) + trigger_merge_request_reviewers_updated(merge_request) success else |