diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
| commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
| tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/serializers/merge_request_sidebar_extras_entity.rb | |
| parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/serializers/merge_request_sidebar_extras_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_sidebar_extras_entity.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/merge_request_sidebar_extras_entity.rb b/app/serializers/merge_request_sidebar_extras_entity.rb index 1a0111fe5d0..c211f9c1608 100644 --- a/app/serializers/merge_request_sidebar_extras_entity.rb +++ b/app/serializers/merge_request_sidebar_extras_entity.rb @@ -2,10 +2,10 @@ class MergeRequestSidebarExtrasEntity < IssuableSidebarExtrasEntity expose :assignees do |merge_request, options| - MergeRequestUserEntity.represent(merge_request.assignees, options.merge(merge_request: merge_request)) + MergeRequestUserEntity.represent(merge_request.assignees, options.merge(merge_request: merge_request, type: :assignees)) end expose :reviewers do |merge_request, options| - MergeRequestUserEntity.represent(merge_request.reviewers, options.merge(merge_request: merge_request)) + MergeRequestUserEntity.represent(merge_request.reviewers, options.merge(merge_request: merge_request, type: :reviewers)) end end |