diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:00 +0300 |
commit | 71c9d577ad563572050335dc261ba7673e3e566f (patch) | |
tree | dcb4bb47b2d843de160feffe26dcefe20403f3fc /app/serializers | |
parent | 63a015fd85ae35634eb882d0078e65d80300816c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/build_artifact_entity.rb | 2 | ||||
-rw-r--r-- | app/serializers/build_details_entity.rb | 2 | ||||
-rw-r--r-- | app/serializers/pipeline_serializer.rb | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/serializers/build_artifact_entity.rb b/app/serializers/build_artifact_entity.rb index d1750695523..fac0fbd14b9 100644 --- a/app/serializers/build_artifact_entity.rb +++ b/app/serializers/build_artifact_entity.rb @@ -15,7 +15,7 @@ class BuildArtifactEntity < Grape::Entity fast_download_project_job_artifacts_path(project, job) end - expose :keep_path, if: -> (*) { job.has_expiring_artifacts? } do |job| + expose :keep_path, if: -> (*) { job.has_expiring_archive_artifacts? } do |job| fast_keep_project_job_artifacts_path(project, job) end diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 480a8cab6ff..0ef71ff8af5 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -31,7 +31,7 @@ class BuildDetailsEntity < JobEntity browse_project_job_artifacts_path(project, build) end - expose :keep_path, if: -> (*) { build.has_expiring_artifacts? && can?(current_user, :update_build, build) } do |build| + expose :keep_path, if: -> (*) { build.has_expiring_archive_artifacts? && can?(current_user, :update_build, build) } do |build| keep_project_job_artifacts_path(project, build) end 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] }, |