diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-20 09:13:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-20 09:13:00 +0300 |
| commit | 9e9a11f86c3ca72110f203ea8629f1bda563a930 (patch) | |
| tree | c3eb95d6e7e68d0d2aad2e52fd2faa4ee6827afe /app/services/merge_requests | |
| parent | d99f2ee027ec0f098207ce7df55feac0021a36c1 (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.rb | 1 | ||||
| -rw-r--r-- | app/services/merge_requests/remove_approval_service.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/services/merge_requests/approval_service.rb b/app/services/merge_requests/approval_service.rb index f9857cdad39..8458eaeaf57 100644 --- a/app/services/merge_requests/approval_service.rb +++ b/app/services/merge_requests/approval_service.rb @@ -4,6 +4,7 @@ module MergeRequests class ApprovalService < MergeRequests::BaseService def execute(merge_request) return unless eligible_for_approval?(merge_request) + return if merge_request.merged? approval = merge_request.approvals.new( user: current_user, diff --git a/app/services/merge_requests/remove_approval_service.rb b/app/services/merge_requests/remove_approval_service.rb index c0bb257eda6..b8f512bdb2c 100644 --- a/app/services/merge_requests/remove_approval_service.rb +++ b/app/services/merge_requests/remove_approval_service.rb @@ -5,6 +5,7 @@ module MergeRequests # rubocop: disable CodeReuse/ActiveRecord def execute(merge_request) return unless merge_request.approved_by?(current_user) + return if merge_request.merged? # paranoid protection against running wrong deletes return unless merge_request.id && current_user.id |