diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/models/concerns/approvable_base.rb | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/models/concerns/approvable_base.rb')
-rw-r--r-- | app/models/concerns/approvable_base.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/approvable_base.rb b/app/models/concerns/approvable_base.rb index ef7ba7b1089..8240f9bd6ea 100644 --- a/app/models/concerns/approvable_base.rb +++ b/app/models/concerns/approvable_base.rb @@ -54,4 +54,8 @@ module ApprovableBase def can_be_approved_by?(user) user && !approved_by?(user) && user.can?(:approve_merge_request, self) end + + def can_be_unapproved_by?(user) + user && approved_by?(user) && user.can?(:approve_merge_request, self) + end end |