Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 3 deletions

diff --git a/lib/gitlab/pages/cache_control.rb b/lib/gitlab/pages/cache_control.rb
index 991a1297d03..84db6d9e343 100644
--- a/lib/gitlab/pages/cache_control.rb
+++ b/lib/gitlab/pages/cache_control.rb
@@ -3,9 +3,9 @@
 module Gitlab
   module Pages
     class CacheControl
-      CACHE_KEY_FORMAT = 'pages_domain_for_%{type}_%{id}'
+      include Gitlab::Utils::StrongMemoize
 
-      attr_reader :cache_key
+      CACHE_KEY_FORMAT = 'pages_domain_for_%{type}_%{id}_%{settings}'
 
       class << self
         def for_project(project_id)
@@ -20,12 +20,35 @@ module Gitlab
       def initialize(type:, id:)
         raise(ArgumentError, "type must be :namespace or :project") unless %i[namespace project].include?(type)
 
-        @cache_key = CACHE_KEY_FORMAT % { type: type, id: id }
+        @type = type
+        @id = id
+      end
+
+      def cache_key
+        strong_memoize(:cache_key) do
+          CACHE_KEY_FORMAT % {
+            type: @type,
+            id: @id,
+            settings: settings
+          }
+        end
       end
 
       def clear_cache
         Rails.cache.delete(cache_key)
       end
+
+      private
+
+      def settings
+        values = ::Gitlab.config.pages.dup
+
+        values['app_settings'] = ::Gitlab::CurrentSettings.attributes.slice(
+          'force_pages_access_control'
+        )
+
+        ::Digest::SHA256.hexdigest(values.inspect)
+      end
     end
   end
 end