summaryrefslogtreecommitdiff
path: root/app/models/pages/lookup_path.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/pages/lookup_path.rb')
-rw-r--r--app/models/pages/lookup_path.rb40
1 files changed, 12 insertions, 28 deletions
diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb
index 17131cd736d..e7d455085c0 100644
--- a/app/models/pages/lookup_path.rb
+++ b/app/models/pages/lookup_path.rb
@@ -26,7 +26,18 @@ module Pages
end
def source
- zip_source || legacy_source
+ return unless deployment&.file
+
+ global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s
+
+ {
+ type: 'zip',
+ path: deployment.file.url_or_file_path(expire_at: 1.day.from_now),
+ global_id: global_id,
+ sha256: deployment.file_sha256,
+ file_size: deployment.size,
+ file_count: deployment.file_count
+ }
end
def prefix
@@ -46,32 +57,5 @@ module Pages
project.pages_metadatum.pages_deployment
end
end
-
- def zip_source
- return unless deployment&.file
-
- global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s
-
- {
- type: 'zip',
- path: deployment.file.url_or_file_path(expire_at: 1.day.from_now),
- global_id: global_id,
- sha256: deployment.file_sha256,
- file_size: deployment.size,
- file_count: deployment.file_count
- }
- end
-
- # TODO: remove support for legacy storage in 14.3 https://gitlab.com/gitlab-org/gitlab/-/issues/328712
- # we support this till 14.3 to allow people to still use legacy storage if something goes very wrong
- # on self-hosted installations, and we'll need some time to fix it
- def legacy_source
- return unless ::Settings.pages.local_store.enabled
-
- {
- type: 'file',
- path: File.join(project.full_path, 'public/')
- }
- end
end
end