diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 21:27:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 21:27:09 +0300 |
| commit | bcc70301531b6c3118120173389f2aaa7452bf11 (patch) | |
| tree | 161f1ee56e15ec9e59f48c5e1a9cb86b62469a49 /app/models | |
| parent | d47fc5085a706ab37d038636c9d5934da69853f0 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/approvable_base.rb | 4 | ||||
| -rw-r--r-- | app/models/concerns/avatarable.rb | 2 |
2 files changed, 5 insertions, 1 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 diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb index ac84ef94b1c..60de20c3b31 100644 --- a/app/models/concerns/avatarable.rb +++ b/app/models/concerns/avatarable.rb @@ -38,7 +38,7 @@ module Avatarable class_methods do def bot_avatar(image:) - Rails.root.join('app', 'assets', 'images', 'bot_avatars', image).open + Rails.root.join('lib', 'assets', 'images', 'bot_avatars', image).open end end |