diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 21:09:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 21:09:27 +0300 |
| commit | bf213f07c8146b7121240af90a07cb4b2ecc41fa (patch) | |
| tree | 184537ad2334124c5090f2a729a9fd58bccf6b51 /app/models/concerns/approvable_base.rb | |
| parent | dd2da214c9644ef1064061d706dfeec50f9fad8f (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 6323bd01c58..d07c4ec43ac 100644 --- a/app/models/concerns/approvable_base.rb +++ b/app/models/concerns/approvable_base.rb @@ -13,4 +13,8 @@ module ApprovableBase approved_by_users.include?(user) end + + def can_be_approved_by?(user) + user && !approved_by?(user) && user.can?(:approve_merge_request, self) + end end |