diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-07 14:33:13 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-13 21:36:27 +0700 |
| commit | 05c0377008438025a7e3396effefc197f6bf2a97 (patch) | |
| tree | b92e8ecac3bcbc41f3be87c0629eedacd45e8c46 /app | |
| parent | 69ed9ae4d4bc0a64713c9a01d6ac27f9fc303101 (diff) | |
| download | gitlab-ce-05c0377008438025a7e3396effefc197f6bf2a97.tar.gz | |
Add attached flag to pipeline entity
Add spec
Fix
Fix
Add changelog
Drop attached
Remove attached
Update changelog
ok
Diffstat (limited to 'app')
| -rw-r--r-- | app/serializers/pipeline_entity.rb | 3 |
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 |