diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 15:09:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 15:09:28 +0000 |
commit | 6535cf9c79362862c31ea7d26c61541b84db18d9 (patch) | |
tree | 6d646edcf11d38e8ac23bceed1340ff8907b850d /app/models/pages | |
parent | 9a8f801d7352b7965fe690a599410fb50005ce67 (diff) | |
download | gitlab-ce-6535cf9c79362862c31ea7d26c61541b84db18d9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/pages')
-rw-r--r-- | app/models/pages/lookup_path.rb | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb index 89f6591ea1e..9855731778f 100644 --- a/app/models/pages/lookup_path.rb +++ b/app/models/pages/lookup_path.rb @@ -40,37 +40,35 @@ module Pages def artifacts_archive return unless Feature.enabled?(:pages_serve_from_artifacts_archive, project) - archive = project.pages_metadatum.artifacts_archive - - archive&.file + project.pages_metadatum.artifacts_archive end def deployment return unless Feature.enabled?(:pages_serve_from_deployments, project) - deployment = project.pages_metadatum.pages_deployment - - deployment&.file + project.pages_metadatum.pages_deployment end def zip_source source = deployment || artifacts_archive - return unless source + return unless source&.file - if source.file_storage? - return unless Feature.enabled?(:pages_serve_with_zip_file_protocol, project) + return if source.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project) - { - type: 'zip', - path: 'file://' + source.path - } - else - { - type: 'zip', - path: source.url(expire_at: 1.day.from_now) - } - end + # artifacts archive doesn't support this + file_count = source.file_count if source.respond_to?(:file_count) + + global_id = ::Gitlab::GlobalId.build(source, id: source.id).to_s + + { + type: 'zip', + path: source.file.url_or_file_path(expire_at: 1.day.from_now), + global_id: global_id, + sha256: source.file_sha256, + file_size: source.size, + file_count: file_count + } end def file_source |