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>2023-09-13 15:11:29 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-13 15:11:29 +0300
commit3c293d24c3408d204be7d84d6319b373c83ff6ae (patch)
treebb64f9751f7d859b43b7a0f58c184c503135373b /app/services/merge_requests
parent2ea5c7c9c919b801d5039722e271ba077cc05986 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r--app/services/merge_requests/approval_service.rb18
1 files changed, 17 insertions, 1 deletions
diff --git a/app/services/merge_requests/approval_service.rb b/app/services/merge_requests/approval_service.rb
index 8560a15b7c4..dbe5567cbc5 100644
--- a/app/services/merge_requests/approval_service.rb
+++ b/app/services/merge_requests/approval_service.rb
@@ -5,12 +5,17 @@ module MergeRequests
def execute(merge_request)
return unless eligible_for_approval?(merge_request)
- approval = merge_request.approvals.new(user: current_user)
+ approval = merge_request.approvals.new(
+ user: current_user,
+ patch_id_sha: fetch_patch_id_sha(merge_request)
+ )
return success unless save_approval(approval)
reset_approvals_cache(merge_request)
+
merge_request_activity_counter.track_approve_mr_action(user: current_user, merge_request: merge_request)
+
trigger_merge_request_merge_status_updated(merge_request)
trigger_merge_request_reviewers_updated(merge_request)
trigger_merge_request_approval_state_updated(merge_request)
@@ -31,6 +36,17 @@ module MergeRequests
private
+ def fetch_patch_id_sha(merge_request)
+ diff_refs = merge_request.diff_refs
+ base_sha = diff_refs&.base_sha
+ head_sha = diff_refs&.head_sha
+
+ return unless base_sha && head_sha
+ return if base_sha == head_sha
+
+ merge_request.project.repository.get_patch_id(base_sha, head_sha)
+ end
+
def eligible_for_approval?(merge_request)
merge_request.eligible_for_approval_by?(current_user)
end