diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-11-27 16:47:10 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-19 17:58:53 +0800 |
| commit | 6c79e9307e116d6115f6d76ac796176952fb83cd (patch) | |
| tree | 85a2981cf3451e9c3918e894b488d3b9fec6337d /app/serializers/merge_request_serializer.rb | |
| parent | 1f7c072e08913dda0534bc5534a50f389567433f (diff) | |
| download | gitlab-ce-6c79e9307e116d6115f6d76ac796176952fb83cd.tar.gz | |
Refactor issuable sidebar to have extras option
Diffstat (limited to 'app/serializers/merge_request_serializer.rb')
| -rw-r--r-- | app/serializers/merge_request_serializer.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/serializers/merge_request_serializer.rb b/app/serializers/merge_request_serializer.rb index 1f8c830e1aa..e252d9a3501 100644 --- a/app/serializers/merge_request_serializer.rb +++ b/app/serializers/merge_request_serializer.rb @@ -7,9 +7,14 @@ class MergeRequestSerializer < BaseSerializer def represent(merge_request, opts = {}) entity = case opts[:serializer] - when 'basic', 'sidebar' + when 'sidebar_extras' + opts[:include_basic] = false + opts[:include_extras] = true + MergeRequestSidebarEntity + when 'basic' MergeRequestBasicEntity - else # It's 'widget' + else + # fallback to widget for old poll requests without `serializer` set MergeRequestWidgetEntity end |