diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-04-07 15:35:16 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-04-08 18:40:00 -0300 |
| commit | ca884980ee8e6fe1269f5abdb803519d51aa09c0 (patch) | |
| tree | 517a448ce25452f26acb5e62384778a99da2f699 /app/serializers/merge_request_serializer.rb | |
| parent | 225edb0d2d7737cf52ef5cd358082d08e20feaa4 (diff) | |
| download | gitlab-ce-ca884980ee8e6fe1269f5abdb803519d51aa09c0.tar.gz | |
[CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requests
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
Diffstat (limited to 'app/serializers/merge_request_serializer.rb')
| -rw-r--r-- | app/serializers/merge_request_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/merge_request_serializer.rb b/app/serializers/merge_request_serializer.rb index 4cf84336aa4..6f589351670 100644 --- a/app/serializers/merge_request_serializer.rb +++ b/app/serializers/merge_request_serializer.rb @@ -8,9 +8,9 @@ class MergeRequestSerializer < BaseSerializer entity = case opts[:serializer] when 'sidebar' - MergeRequestSidebarBasicEntity + IssuableSidebarBasicEntity when 'sidebar_extras' - IssuableSidebarExtrasEntity + MergeRequestSidebarExtrasEntity when 'basic' MergeRequestBasicEntity else |