From b570d73ecd31e2ca9cf8c2f1adb056edf2869477 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 19 Nov 2019 12:06:00 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/serializers/analytics_merge_request_entity.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/serializers') diff --git a/app/serializers/analytics_merge_request_entity.rb b/app/serializers/analytics_merge_request_entity.rb index 21d7eeb81b0..4344de2b9b4 100644 --- a/app/serializers/analytics_merge_request_entity.rb +++ b/app/serializers/analytics_merge_request_entity.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true class AnalyticsMergeRequestEntity < AnalyticsIssueEntity - expose :state + expose :state do |object| + MergeRequest.available_states.key(object[:state_id]) + end expose :url do |object| url_to(:namespace_project_merge_request, object) -- cgit v1.2.1