diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 12:07:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 12:07:45 +0000 |
| commit | ac1dca43baa7b3b1ac7d60d89ad60fdeefed0b80 (patch) | |
| tree | 33aa23ddf7f18ddbfba3d006041c460de88583b7 /app/serializers | |
| parent | f4186a753b86625a83e8499af14b5badd63a2ac2 (diff) | |
| download | gitlab-ce-ac1dca43baa7b3b1ac7d60d89ad60fdeefed0b80.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 3ad9f2bc0bf..b2c0ceb640b 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -56,9 +56,14 @@ class PipelineSerializer < BaseSerializer :manual_actions, :scheduled_actions, :artifacts, - :merge_request, :user, { + merge_request: { + source_project: [:route, { namespace: :route }], + target_project: [:route, { namespace: :route }] + } + }, + { pending_builds: :project, project: [:route, { namespace: :route }], artifacts: { |