From 102bf42b96e60ca468a6b10b52d266e4e666ccd2 Mon Sep 17 00:00:00 2001
From: Kerri Miller <kerrizor@kerrizor.com>
Date: Thu, 21 Dec 2023 08:59:48 -0800
Subject: [PATCH] Minor formatting changes
Adding some load-bearing whitespace and tidying up some long comments.
---
ee/app/services/ee/merge_requests/refresh_service.rb | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/ee/app/services/ee/merge_requests/refresh_service.rb b/ee/app/services/ee/merge_requests/refresh_service.rb
index c9085e45c4cd..ef5a57521638 100644
--- a/ee/app/services/ee/merge_requests/refresh_service.rb
+++ b/ee/app/services/ee/merge_requests/refresh_service.rb
@@ -15,7 +15,9 @@ def refresh_merge_requests!
update_approvers_for_source_branch_merge_requests
update_approvers_for_target_branch_merge_requests
+
reset_approvals_for_merge_requests(push.ref, push.newrev)
+
trigger_suggested_reviewers_fetch
sync_any_merge_request_approval_rules
end
@@ -31,15 +33,19 @@ def trigger_suggested_reviewers_fetch
end
def reset_approvals_for_merge_requests(ref, newrev)
- # Add a flag that prevents unverified changes from getting through in the 10 second window below
+ # Add a flag that prevents unverified changes from getting through in the
+ # 10 second window below
+ #
merge_requests_for(push.branch_name, mr_states: [:opened, :closed]).each do |mr|
if reset_approvals?(mr, newrev)
mr.approval_state.temporarily_unapprove!
end
end
- # We need to make sure the code owner approval rules have all been synced first, so we delay for 10s
- # We are trying to pin down and fix the race condition: https://gitlab.com/gitlab-org/gitlab/-/issues/373846
+ # We need to make sure the code owner approval rules have all been synced
+ # first, so we delay for 10s. We are trying to pin down and fix the race
+ # condition: https://gitlab.com/gitlab-org/gitlab/-/issues/373846
+ #
MergeRequestResetApprovalsWorker.perform_in(10.seconds, project.id, current_user.id, ref, newrev)
end
--
GitLab