Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 15:06:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 15:06:00 +0300
commitb570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch)
tree0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /app/serializers/analytics_merge_request_entity.rb
parent34b3567c97ecc0f317adae04e10e4d7d8c8830db (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/analytics_merge_request_entity.rb')
-rw-r--r--app/serializers/analytics_merge_request_entity.rb4
1 files changed, 3 insertions, 1 deletions
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)