Commit ff766c90 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'rename-design_management-feature-flag' into 'master'

Rename design management feature flag

See merge request gitlab-org/gitlab-ee!14658
parents 541dc541 fddba2a3
......@@ -578,7 +578,7 @@ module EE
# on prem installs yet.
lfs_enabled? &&
feature_available?(:design_management) &&
::Feature.enabled?(:design_management, self)
::Feature.enabled?(:design_management_flag, self) # Named to avoid the bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/64468
end
def design_repository
......
......@@ -1843,7 +1843,7 @@ describe Project do
with_them do
before do
stub_licensed_features(design_management: license_enabled)
stub_feature_flags(design_management: feature_enabled)
stub_feature_flags(design_management_flag: feature_enabled)
expect(project).to receive(:lfs_enabled?).and_return(lfs_enabled)
end
......
......@@ -97,7 +97,7 @@ describe DesignManagement::DesignPolicy do
context "when the feature flag is off" do
before do
stub_licensed_features(design_management: true)
stub_feature_flags(design_management: false)
stub_feature_flags(design_management_flag: false)
allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
end
......@@ -107,7 +107,7 @@ describe DesignManagement::DesignPolicy do
context "when the license does not include the feature" do
before do
stub_licensed_features(design_management: false)
stub_feature_flags(design_management: true)
stub_feature_flags(design_management_flag: true)
allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
end
......@@ -117,7 +117,7 @@ describe DesignManagement::DesignPolicy do
context "when LFS is not enabled" do
before do
stub_licensed_features(design_management: true)
stub_feature_flags(design_management: true)
stub_feature_flags(design_management_flag: true)
allow(Gitlab.config.lfs).to receive(:enabled).and_return(false)
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