From 5f0fc0f308cbd1d9f6004c872b9b43fa081df696 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 21 Feb 2019 15:02:27 +0900 Subject: [PATCH] Expose merge request pipeline information in pipeline entity --- app/serializers/pipeline_entity.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb index 29b1a6c244b624..544e634cbb88a2 100644 --- a/app/serializers/pipeline_entity.rb +++ b/app/serializers/pipeline_entity.rb @@ -52,6 +52,13 @@ class PipelineEntity < Grape::Entity expose :merge_request?, as: :merge_request end + expose :merge_request_pipeline, if: -> (pipeline, _) { pipeline.merge_request? } do + expose :detached_merge_pipeline?, as: :detached_merge_pipeline + expose :merge_pipeline?, as: :merge_pipeline + expose :mergeable_merge_pipeline?, as: :mergeable_merge_pipeline + expose :merge_request, with: MergeRequestBasicEntity + end + expose :commit, using: CommitEntity expose :yaml_errors, if: -> (pipeline, _) { pipeline.has_yaml_errors? } -- GitLab