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/models/concerns/approvable.rb')
-rw-r--r--app/models/concerns/approvable.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/approvable.rb b/app/models/concerns/approvable.rb
index 1566c53217d..55e138d84fb 100644
--- a/app/models/concerns/approvable.rb
+++ b/app/models/concerns/approvable.rb
@@ -50,11 +50,11 @@ module Approvable
approvals.where(user: user).any?
end
- def can_be_approved_by?(user)
+ def eligible_for_approval_by?(user)
user && !approved_by?(user) && user.can?(:approve_merge_request, self)
end
- def can_be_unapproved_by?(user)
+ def eligible_for_unapproval_by?(user)
user && approved_by?(user) && user.can?(:approve_merge_request, self)
end
end