Commit a801fb8d authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch '281178-remove-pages_serve_from_deployments-ff' into 'master'

Remove pages_serve_from_deployments FF [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!54420
parents 7ec12ca8 f308d04c
...@@ -43,8 +43,6 @@ module Pages ...@@ -43,8 +43,6 @@ module Pages
def deployment def deployment
strong_memoize(:deployment) do strong_memoize(:deployment) do
next unless Feature.enabled?(:pages_serve_from_deployments, project, default_enabled: true)
project.pages_metadatum.pages_deployment project.pages_metadatum.pages_deployment
end end
end end
......
---
name: pages_serve_from_deployments
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46320
rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/2932
milestone: '13.6'
type: development
group: group::release
default_enabled: true
...@@ -117,14 +117,6 @@ RSpec.describe Pages::LookupPath do ...@@ -117,14 +117,6 @@ RSpec.describe Pages::LookupPath do
end end
end end
context 'when pages_serve_from_deployments feature flag is disabled' do
before do
stub_feature_flags(pages_serve_from_deployments: false)
end
include_examples 'uses disk storage'
end
context 'when deployment were created during migration' do context 'when deployment were created during migration' do
before do before do
allow(deployment).to receive(:migrated?).and_return(true) allow(deployment).to receive(:migrated?).and_return(true)
......
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