diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 03:09:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 03:09:11 +0300 |
commit | 65093195c2c956c73f587ee51cc9fcafe4708e96 (patch) | |
tree | 6097e3663d89c7a3f429c6ba752a7661b31b7665 /app/serializers | |
parent | c03dce2dc9f0f257faac4d43d208d96320ca5c0e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/merge_request_user_entity.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/serializers/merge_request_user_entity.rb b/app/serializers/merge_request_user_entity.rb index 12c573d1a13..2e875af6531 100644 --- a/app/serializers/merge_request_user_entity.rb +++ b/app/serializers/merge_request_user_entity.rb @@ -20,10 +20,6 @@ class MergeRequestUserEntity < ::API::Entities::UserBasic find_reviewer_or_assignee(user, options)&.reviewed? end - expose :attention_requested, if: ->(_, options) { options[:merge_request].present? && options[:merge_request].allows_reviewers? && request.current_user&.mr_attention_requests_enabled? } do |user, options| - find_reviewer_or_assignee(user, options)&.attention_requested? - end - expose :approved, if: satisfies(:present?) do |user, options| # This approach is preferred over MergeRequest#approved_by? since this # makes one query per merge request, whereas #approved_by? makes one per user |