Commit 593568df authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch...

Merge branch '300021-rollout-serving-migrated-data-feature-flag-pages_serve_from_migrated_zip' into 'master'

Remove pages_serve_from_migrated_zip feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!59002
parents 522037d0 59b26fca
...@@ -52,8 +52,6 @@ module Pages ...@@ -52,8 +52,6 @@ module Pages
return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project, default_enabled: :yaml) return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project, default_enabled: :yaml)
return if deployment.migrated? && !Feature.enabled?(:pages_serve_from_migrated_zip, project, default_enabled: true)
global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s
{ {
......
---
title: Remove pages_serve_from_migrated_zip feature flag
merge_request: 59002
author:
type: added
---
name: pages_serve_from_migrated_zip
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52573
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300021
milestone: '13.9'
type: development
group: group::release
default_enabled: true
...@@ -136,14 +136,6 @@ RSpec.describe Pages::LookupPath do ...@@ -136,14 +136,6 @@ RSpec.describe Pages::LookupPath do
) )
end end
end end
context 'when pages_serve_from_migrated_zip feature flag is disabled' do
before do
stub_feature_flags(pages_serve_from_migrated_zip: false)
end
include_examples 'uses disk storage'
end
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment