diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-23 21:12:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-23 21:12:59 +0300 |
| commit | 3acaaf7231d0779a6ceb37fca693cd81e698ef90 (patch) | |
| tree | 22a068ab03faa19008997f5bc10298282ad077ab /app/serializers/merge_request_noteable_entity.rb | |
| parent | 2cba761741967eb6baf797af2ee0a702c2ffbdfe (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/merge_request_noteable_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_noteable_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_noteable_entity.rb b/app/serializers/merge_request_noteable_entity.rb index 29bd26c3a15..07d7d19d1f3 100644 --- a/app/serializers/merge_request_noteable_entity.rb +++ b/app/serializers/merge_request_noteable_entity.rb @@ -51,7 +51,7 @@ class MergeRequestNoteableEntity < IssuableEntity end expose :can_approve do |merge_request| - merge_request.can_be_approved_by?(current_user) + merge_request.eligible_for_approval_by?(current_user) end end |