diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/serializers/merge_request_user_entity.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/serializers/merge_request_user_entity.rb')
-rw-r--r-- | app/serializers/merge_request_user_entity.rb | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/app/serializers/merge_request_user_entity.rb b/app/serializers/merge_request_user_entity.rb index 53257b0602c..604c9cabd50 100644 --- a/app/serializers/merge_request_user_entity.rb +++ b/app/serializers/merge_request_user_entity.rb @@ -1,26 +1,9 @@ # frozen_string_literal: true -class MergeRequestUserEntity < CurrentUserEntity - include RequestAwareEntity - include BlobHelper - include TreeHelper - - expose :can_fork do |user| - can?(user, :fork_project, request.project) if project - end - - expose :can_create_merge_request do |user| - project && can?(user, :create_merge_request_in, project) - end - - expose :fork_path, if: -> (*) { project } do |user| - params = edit_blob_fork_params("Edit") - project_forks_path(project, namespace_key: user.namespace.id, continue: params) - end - - def project - return false unless request.respond_to?(:project) && request.project - - request.project +class MergeRequestUserEntity < ::API::Entities::UserBasic + expose :can_merge do |reviewer, options| + options[:merge_request]&.can_be_merged_by?(reviewer) end end + +MergeRequestUserEntity.prepend_if_ee('EE::MergeRequestUserEntity') |