summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-23 15:07:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-23 15:07:42 +0000
commitbc0f141f2f073a971aad1eb5349bb718747df028 (patch)
tree72fcc48dfac8e3f3560e22014eacdd2eaae8bc89 /app/services/merge_requests
parent2c29837ce1692790dedccbc9b36b44dc8aaacbee (diff)
downloadgitlab-ce-bc0f141f2f073a971aad1eb5349bb718747df028.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r--app/services/merge_requests/base_service.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index e7ab2c062ee..fabf006979b 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -59,6 +59,8 @@ module MergeRequests
merge_request_activity_counter.track_users_review_requested(users: new_reviewers)
merge_request_activity_counter.track_reviewers_changed_action(user: current_user)
trigger_merge_request_reviewers_updated(merge_request)
+
+ capture_suggested_reviewers_accepted(merge_request)
end
def cleanup_environments(merge_request)
@@ -161,6 +163,12 @@ module MergeRequests
else
params.delete(:reviewer_ids)
end
+
+ filter_suggested_reviewers
+ end
+
+ def filter_suggested_reviewers
+ # Implemented in EE
end
def merge_request_metrics_service(merge_request)
@@ -253,6 +261,10 @@ module MergeRequests
def trigger_merge_request_merge_status_updated(merge_request)
GraphqlTriggers.merge_request_merge_status_updated(merge_request)
end
+
+ def capture_suggested_reviewers_accepted(merge_request)
+ # Implemented in EE
+ end
end
end