summaryrefslogtreecommitdiff
path: root/app/serializers/merge_request_basic_entity.rb
diff options
context:
space:
mode:
authorMario de la Ossa <mariodelaossa@gmail.com>2018-06-14 13:39:17 -0600
committerMario de la Ossa <mariodelaossa@gmail.com>2018-06-15 17:46:49 -0600
commitc6420ce2ab18681d6a5b06621d89775e3cf81065 (patch)
tree09c00408052a9a678d3c99b0c2412e2a699a63e9 /app/serializers/merge_request_basic_entity.rb
parentedfa2e3fb673412272e8bc9cdbfa2e3a86a9f21f (diff)
downloadgitlab-ce-c6420ce2ab18681d6a5b06621d89775e3cf81065.tar.gz
Fix milestones disappearing when changed on MR47933-MR-invisible-milestone
Diffstat (limited to 'app/serializers/merge_request_basic_entity.rb')
-rw-r--r--app/serializers/merge_request_basic_entity.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/merge_request_basic_entity.rb b/app/serializers/merge_request_basic_entity.rb
index e4aec977f01..1c06691026d 100644
--- a/app/serializers/merge_request_basic_entity.rb
+++ b/app/serializers/merge_request_basic_entity.rb
@@ -5,4 +5,8 @@ class MergeRequestBasicEntity < IssuableSidebarEntity
expose :state
expose :source_branch_exists?, as: :source_branch_exists
expose :rebase_in_progress?, as: :rebase_in_progress
+ expose :milestone, using: API::Entities::Milestone
+ expose :labels, using: LabelEntity
+ expose :assignee, using: API::Entities::UserBasic
+ expose :task_status, :task_status_short
end