diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/serializers/pipeline_serializer.rb | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/serializers/pipeline_serializer.rb')
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 21d49c6c292..bfd6851647f 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -60,8 +60,8 @@ class PipelineSerializer < BaseSerializer }, pending_builds: :project, project: [:route, { namespace: :route }], - triggered_by_pipeline: [:project, :user], - triggered_pipelines: [:project, :user] + triggered_by_pipeline: [{ project: [:route, { namespace: :route }] }, :user], + triggered_pipelines: [{ project: [:route, { namespace: :route }] }, :user, :source_job] } ] end |