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:
authorShinya Maeda <shinya@gitlab.com>2019-03-07 10:33:13 +0300
committerShinya Maeda <shinya@gitlab.com>2019-03-13 17:36:27 +0300
commit05c0377008438025a7e3396effefc197f6bf2a97 (patch)
treeb92e8ecac3bcbc41f3be87c0629eedacd45e8c46 /app/serializers
parent69ed9ae4d4bc0a64713c9a01d6ac27f9fc303101 (diff)
Add attached flag to pipeline entity
Add spec Fix Fix Add changelog Drop attached Remove attached Update changelog ok
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/pipeline_entity.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb
index 5ac1e590d39..fba72410217 100644
--- a/app/serializers/pipeline_entity.rb
+++ b/app/serializers/pipeline_entity.rb
@@ -28,7 +28,8 @@ class PipelineEntity < Grape::Entity
expose :can_retry?, as: :retryable
expose :can_cancel?, as: :cancelable
expose :failure_reason?, as: :failure_reason
- expose :detached_merge_request_pipeline?, as: :detached
+ expose :detached_merge_request_pipeline?, as: :detached_merge_request_pipeline
+ expose :merge_request_pipeline?, as: :merge_request_pipeline
end
expose :details do