summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-10-17 19:07:36 +0900
committerShinya Maeda <shinya@gitlab.com>2018-10-17 19:07:36 +0900
commit10b8cdbfed685d4499fc424e3106f98837647606 (patch)
treeda40362ad9aaf316f1bc066c7cd8a6f409714815
parent2f2c1ba87b1cbda5c7d836fc567cc9c3263419e2 (diff)
parent2026dac66aac6632a1b2ea5dd0fe4e98a777eb69 (diff)
downloadgitlab-ce-show-target-pipeline-in-mr-widget.tar.gz
Merge branch 'expose-deployment-status-for-mr-widget' into show-target-pipeline-in-mr-widgetshow-target-pipeline-in-mr-widget
-rw-r--r--app/serializers/pipeline_details_entity.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/pipeline_details_entity.rb b/app/serializers/pipeline_details_entity.rb
index 66a041d180a..993d4b3a9e4 100644
--- a/app/serializers/pipeline_details_entity.rb
+++ b/app/serializers/pipeline_details_entity.rb
@@ -6,7 +6,7 @@ class PipelineDetailsEntity < PipelineEntity
expose :artifacts, using: BuildArtifactEntity
expose :manual_actions, using: BuildActionEntity
expose :scheduled_actions, using: BuildActionEntity
- expose :deployments_statuses, using: DetailedStatusEntity
+ expose :deployments_statuses, using: DetailedDeploymentStatusEntity
end
private