Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 00:09:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 00:09:00 +0300
commit71c9d577ad563572050335dc261ba7673e3e566f (patch)
treedcb4bb47b2d843de160feffe26dcefe20403f3fc /app/serializers/pipeline_serializer.rb
parent63a015fd85ae35634eb882d0078e65d80300816c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/pipeline_serializer.rb')
-rw-r--r--app/serializers/pipeline_serializer.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index be535a5d414..58df62dfea5 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -58,7 +58,8 @@ class PipelineSerializer < BaseSerializer
pending_builds: :project,
project: [:route, { namespace: :route }],
artifacts: {
- project: [:route, { namespace: :route }]
+ project: [:route, { namespace: :route }],
+ job_artifacts_archive: []
}
},
{ triggered_by_pipeline: [:project, :user] },