diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /app/serializers/user_serializer.rb | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/serializers/user_serializer.rb')
| -rw-r--r-- | app/serializers/user_serializer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index d988caea92d..dfbd787298d 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -8,7 +8,7 @@ class UserSerializer < BaseSerializer merge_request = opts[:project].merge_requests.find_by_iid!(params[:merge_request_iid]) preload_max_member_access(merge_request.project, Array(resource)) - super(resource, opts.merge(merge_request: merge_request), MergeRequestAssigneeEntity) + super(resource, opts.merge(merge_request: merge_request), MergeRequestUserEntity) else super end @@ -20,3 +20,5 @@ class UserSerializer < BaseSerializer project.team.max_member_access_for_user_ids(users.map(&:id)) end end + +UserSerializer.prepend_if_ee('EE::UserSerializer') |