Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 5 deletions

diff --git a/spec/models/pages/lookup_path_spec.rb b/spec/models/pages/lookup_path_spec.rb
index e520f82c118..735f2225c21 100644
--- a/spec/models/pages/lookup_path_spec.rb
+++ b/spec/models/pages/lookup_path_spec.rb
@@ -52,11 +52,8 @@ RSpec.describe Pages::LookupPath do
       expect(source[:path]).to eq(project.full_path + "/public/")
     end
 
-    it 'return nil when legacy storage is disabled and there is no deployment' do
-      stub_feature_flags(pages_serve_from_legacy_storage: false)
-      expect(Gitlab::ErrorTracking).to receive(:track_exception)
-                                         .with(described_class::LegacyStorageDisabledError, project_id: project.id)
-                                         .and_call_original
+    it 'return nil when local storage is disabled and there is no deployment' do
+      allow(Settings.pages.local_store).to receive(:enabled).and_return(false)
 
       expect(source).to eq(nil)
     end