Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 5 insertions, 10 deletions

diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb
index 3285a1f7f4c..17131cd736d 100644
--- a/app/models/pages/lookup_path.rb
+++ b/app/models/pages/lookup_path.rb
@@ -50,8 +50,6 @@ module Pages
     def zip_source
       return unless deployment&.file
 
-      return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project, default_enabled: :yaml)
-
       global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s
 
       {
@@ -64,17 +62,16 @@ module Pages
       }
     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
-      raise LegacyStorageDisabledError unless Feature.enabled?(:pages_serve_from_legacy_storage, default_enabled: true)
+      return unless ::Settings.pages.local_store.enabled
 
       {
         type: 'file',
         path: File.join(project.full_path, 'public/')
       }
-    rescue LegacyStorageDisabledError => e
-      Gitlab::ErrorTracking.track_exception(e, project_id: project.id)
-
-      nil
     end
   end
 end
diff --git a/app/models/pages/virtual_domain.rb b/app/models/pages/virtual_domain.rb
index 90cb8253b52..497f67993ae 100644
--- a/app/models/pages/virtual_domain.rb
+++ b/app/models/pages/virtual_domain.rb
@@ -21,9 +21,7 @@ module Pages
         project.pages_lookup_path(trim_prefix: trim_prefix, domain: domain)
       end
 
-      # TODO: remove in https://gitlab.com/gitlab-org/gitlab/-/issues/297524
-      # source can only be nil if pages_serve_from_legacy_storage FF is disabled
-      # we can remove this filtering once we remove legacy storage
+      # TODO: remove in https://gitlab.com/gitlab-org/gitlab/-/issues/328715
       paths = paths.select(&:source)
 
       paths.sort_by(&:prefix).reverse