Commit 587255de authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch '42411-remove-design_management_require_hashed_storage-feature-flag' into 'master'

Remove `design_management_require_hashed_storage` feature flag

See merge request gitlab-org/gitlab!28877
parents 8e980584 a10a960c
...@@ -645,12 +645,7 @@ module EE ...@@ -645,12 +645,7 @@ module EE
# LFS and hashed repository storage are required for using Design Management. # LFS and hashed repository storage are required for using Design Management.
def design_management_enabled? def design_management_enabled?
lfs_enabled? && lfs_enabled? && hashed_storage?(:repository)
# We will allow the hashed storage requirement to be disabled for
# a few releases until we are able to understand the impact of the
# hashed storage requirement for existing design management projects.
# See https://gitlab.com/gitlab-org/gitlab/issues/13428#note_238729038
(hashed_storage?(:repository) || ::Feature.disabled?(:design_management_require_hashed_storage, self, default_enabled: true))
end end
def design_repository def design_repository
......
...@@ -2048,20 +2048,15 @@ describe Project do ...@@ -2048,20 +2048,15 @@ describe Project do
describe '#design_management_enabled?' do describe '#design_management_enabled?' do
let(:project) { build(:project) } let(:project) { build(:project) }
where(:lfs_enabled, :hashed_storage_enabled, :hash_storage_required, :expectation) do where(:lfs_enabled, :hashed_storage_enabled, :expectation) do
false | false | false | false false | false | false
false | true | true | false true | false | false
false | true | false | false false | true | false
false | false | true | false true | true | true
true | false | false | true
true | true | true | true
true | true | false | true
true | false | true | false
end end
with_them do with_them do
before do before do
stub_feature_flags(design_management_require_hashed_storage: hash_storage_required)
expect(project).to receive(:lfs_enabled?).and_return(lfs_enabled) expect(project).to receive(:lfs_enabled?).and_return(lfs_enabled)
allow(project).to receive(:hashed_storage?).with(:repository).and_return(hashed_storage_enabled) allow(project).to receive(:hashed_storage?).with(:repository).and_return(hashed_storage_enabled)
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