diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 21:10:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 21:10:36 +0300 |
commit | fa885192b7d34ba910d1be629ad58c18148a86f1 (patch) | |
tree | ea4316b12a15d6767d8cc12cee4f9feb5a076d91 /app/models/concerns/approvable_base.rb | |
parent | af7ba639ec0b6bba26adc244e8971d4113d2c041 (diff) |
Add latest changes from gitlab-org/gitlab@master
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 |