Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 3 deletions

diff --git a/lib/gitlab/pages/settings.rb b/lib/gitlab/pages/settings.rb
index 8650a80a85e..0e77259a0de 100644
--- a/lib/gitlab/pages/settings.rb
+++ b/lib/gitlab/pages/settings.rb
@@ -6,12 +6,22 @@ module Gitlab
       DiskAccessDenied = Class.new(StandardError)
 
       def path
-        if ::Gitlab::Runtime.web_server? && !::Gitlab::Runtime.test_suite?
-          raise DiskAccessDenied
-        end
+        ::Gitlab::ErrorTracking.track_exception(DiskAccessDenied.new) if disk_access_denied?
 
         super
       end
+
+      def local_store
+        @local_store ||= ::Gitlab::Pages::Stores::LocalStore.new(super)
+      end
+
+      private
+
+      def disk_access_denied?
+        return true unless ::Settings.pages.local_store&.enabled
+
+        ::Gitlab::Runtime.web_server? && !::Gitlab::Runtime.test_suite?
+      end
     end
   end
 end
diff --git a/lib/gitlab/pages/stores/local_store.rb b/lib/gitlab/pages/stores/local_store.rb
new file mode 100644
index 00000000000..68a7ebaceff
--- /dev/null
+++ b/lib/gitlab/pages/stores/local_store.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Pages
+    module Stores
+      class LocalStore < ::SimpleDelegator
+        def enabled
+          return false unless Feature.enabled?(:pages_update_legacy_storage, default_enabled: true)
+
+          super
+        end
+      end
+    end
+  end
+end