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 /lib/api/entities/merge_request_approvals.rb | |
| parent | d47fc5085a706ab37d038636c9d5934da69853f0 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'lib/api/entities/merge_request_approvals.rb')
| -rw-r--r-- | lib/api/entities/merge_request_approvals.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/entities/merge_request_approvals.rb b/lib/api/entities/merge_request_approvals.rb index e3d58d687c4..0c464844ae7 100644 --- a/lib/api/entities/merge_request_approvals.rb +++ b/lib/api/entities/merge_request_approvals.rb @@ -8,8 +8,7 @@ module API end expose :user_can_approve do |merge_request, options| - !merge_request.approved_by?(options[:current_user]) && - options[:current_user].can?(:approve_merge_request, merge_request) + merge_request.can_be_approved_by?(options[:current_user]) end expose :approved do |merge_request| |