Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

2 files changed, 5 insertions, 0 deletions

diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb
index c1056d4f6cb..cf0f0f9e92f 100644
--- a/app/models/pages/lookup_path.rb
+++ b/app/models/pages/lookup_path.rb
@@ -19,11 +19,13 @@ module Pages
     def access_control
       project.private_pages?
     end
+    strong_memoize_attr :access_control
 
     def https_only
       domain_https = domain ? domain.https? : true
       project.pages_https_only? && domain_https
     end
+    strong_memoize_attr :https_only
 
     def source
       return unless deployment&.file
@@ -41,6 +43,7 @@ module Pages
         file_count: deployment.file_count
       }
     end
+    strong_memoize_attr :source
 
     def prefix
       if project.pages_group_root?
@@ -49,6 +52,7 @@ module Pages
         project.full_path.delete_prefix(trim_prefix) + '/'
       end
     end
+    strong_memoize_attr :prefix
 
     private
 
diff --git a/app/models/pages/virtual_domain.rb b/app/models/pages/virtual_domain.rb
index 119cc7fc166..fafbe449c8c 100644
--- a/app/models/pages/virtual_domain.rb
+++ b/app/models/pages/virtual_domain.rb
@@ -28,6 +28,7 @@ module Pages
       paths.sort_by(&:prefix).reverse
     end
 
+    # cache_key is required by #present_cached in ::API::Internal::Pages
     def cache_key
       @cache_key ||= cache&.cache_key
     end