diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
| commit | 905c1110b08f93a19661cf42a276c7ea90d0a0ff (patch) | |
| tree | 756d138db422392c00471ab06acdff92c5a9b69c /app/serializers/pipeline_serializer.rb | |
| parent | 50d93f8d1686950fc58dda4823c4835fd0d8c14b (diff) | |
| download | gitlab-ce-905c1110b08f93a19661cf42a276c7ea90d0a0ff.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
Diffstat (limited to 'app/serializers/pipeline_serializer.rb')
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index eaaeaf040a2..fc3160e3c69 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -54,9 +54,9 @@ class PipelineSerializer < BaseSerializer artifacts: { project: [:route, { namespace: :route }] } - } + }, + { triggered_by_pipeline: [:project, :user] }, + { triggered_pipelines: [:project, :user] } ] end end - -PipelineSerializer.prepend_if_ee('EE::PipelineSerializer') |