Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/api/entities/merge_request_approvals.rb')
-rw-r--r--lib/api/entities/merge_request_approvals.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities/merge_request_approvals.rb b/lib/api/entities/merge_request_approvals.rb
index d8a464cfeda..e3d58d687c4 100644
--- a/lib/api/entities/merge_request_approvals.rb
+++ b/lib/api/entities/merge_request_approvals.rb
@@ -4,11 +4,11 @@ module API
module Entities
class MergeRequestApprovals < Grape::Entity
expose :user_has_approved do |merge_request, options|
- merge_request.has_approved?(options[:current_user])
+ merge_request.approved_by?(options[:current_user])
end
expose :user_can_approve do |merge_request, options|
- !merge_request.has_approved?(options[:current_user]) &&
+ !merge_request.approved_by?(options[:current_user]) &&
options[:current_user].can?(:approve_merge_request, merge_request)
end