diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 12:07:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 12:07:51 +0300 |
| commit | 914ea32e0efca21436220df2c10e1bfbe4ed3da9 (patch) | |
| tree | e8eb3b97aea2006bd863c586b7ec41d51f654b3b /app/serializers/pipeline_details_entity.rb | |
| parent | 3546e1bb0971347e9e9984de0799e3fb53743b33 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/pipeline_details_entity.rb')
| -rw-r--r-- | app/serializers/pipeline_details_entity.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/serializers/pipeline_details_entity.rb b/app/serializers/pipeline_details_entity.rb index 808e87c3fcf..71589ac8315 100644 --- a/app/serializers/pipeline_details_entity.rb +++ b/app/serializers/pipeline_details_entity.rb @@ -10,6 +10,7 @@ class PipelineDetailsEntity < PipelineEntity expose :manual_actions, using: BuildActionEntity expose :scheduled_actions, using: BuildActionEntity end -end -PipelineDetailsEntity.prepend_if_ee('EE::PipelineDetailsEntity') + expose :triggered_by_pipeline, as: :triggered_by, with: TriggeredPipelineEntity + expose :triggered_pipelines, as: :triggered, using: TriggeredPipelineEntity +end |