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:
Diffstat (limited to 'app/services/merge_requests/remove_approval_service.rb')
-rw-r--r--app/services/merge_requests/remove_approval_service.rb1
1 files changed, 1 insertions, 0 deletions
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