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_serializer.rb | |
| parent | 3546e1bb0971347e9e9984de0799e3fb53743b33 (diff) | |
Add latest changes from gitlab-org/gitlab@master
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') |