Commit 5889b69a authored by Peter Leitzen's avatar Peter Leitzen

Merge branch '205682-feature-flag-removal' into 'master'

Remove the `nuget_package_registry` feature flag

See merge request gitlab-org/gitlab!25685
parents 7c9be72f ea48ad9b
...@@ -91,7 +91,6 @@ module API ...@@ -91,7 +91,6 @@ module API
end end
resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
before do before do
not_found! if Feature.disabled?(:nuget_package_registry, authorized_user_project, default_enabled: true)
authorize_packages_feature!(authorized_user_project) authorize_packages_feature!(authorized_user_project)
end end
......
...@@ -19,11 +19,6 @@ describe API::NugetPackages do ...@@ -19,11 +19,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -67,9 +62,6 @@ describe API::NugetPackages do ...@@ -67,9 +62,6 @@ describe API::NugetPackages do
it_behaves_like 'rejects nuget access with invalid project id' it_behaves_like 'rejects nuget access with invalid project id'
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
...@@ -86,11 +78,6 @@ describe API::NugetPackages do ...@@ -86,11 +78,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -133,9 +120,6 @@ describe API::NugetPackages do ...@@ -133,9 +120,6 @@ describe API::NugetPackages do
it_behaves_like 'rejects nuget access with invalid project id' it_behaves_like 'rejects nuget access with invalid project id'
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
...@@ -162,11 +146,6 @@ describe API::NugetPackages do ...@@ -162,11 +146,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -209,9 +188,6 @@ describe API::NugetPackages do ...@@ -209,9 +188,6 @@ describe API::NugetPackages do
it_behaves_like 'rejects nuget access with invalid project id' it_behaves_like 'rejects nuget access with invalid project id'
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
...@@ -227,11 +203,6 @@ describe API::NugetPackages do ...@@ -227,11 +203,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -275,9 +246,6 @@ describe API::NugetPackages do ...@@ -275,9 +246,6 @@ describe API::NugetPackages do
end end
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
...@@ -293,11 +261,6 @@ describe API::NugetPackages do ...@@ -293,11 +261,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -343,9 +306,6 @@ describe API::NugetPackages do ...@@ -343,9 +306,6 @@ describe API::NugetPackages do
end end
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
...@@ -361,11 +321,6 @@ describe API::NugetPackages do ...@@ -361,11 +321,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -409,9 +364,6 @@ describe API::NugetPackages do ...@@ -409,9 +364,6 @@ describe API::NugetPackages do
it_behaves_like 'rejects nuget access with invalid project id' it_behaves_like 'rejects nuget access with invalid project id'
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
...@@ -428,11 +380,6 @@ describe API::NugetPackages do ...@@ -428,11 +380,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -476,9 +423,6 @@ describe API::NugetPackages do ...@@ -476,9 +423,6 @@ describe API::NugetPackages do
it_behaves_like 'rejects nuget access with invalid project id' it_behaves_like 'rejects nuget access with invalid project id'
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
...@@ -502,11 +446,6 @@ describe API::NugetPackages do ...@@ -502,11 +446,6 @@ describe API::NugetPackages do
stub_licensed_features(packages: true) stub_licensed_features(packages: true)
end end
context 'with feature flag enabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: true, thing: project })
end
context 'with valid project' do context 'with valid project' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
...@@ -550,9 +489,6 @@ describe API::NugetPackages do ...@@ -550,9 +489,6 @@ describe API::NugetPackages do
it_behaves_like 'rejects nuget access with invalid project id' it_behaves_like 'rejects nuget access with invalid project id'
end end
it_behaves_like 'rejects nuget packages access with feature flag disabled'
end
it_behaves_like 'rejects nuget packages access with packages features disabled' it_behaves_like 'rejects nuget packages access with packages features disabled'
end end
end end
...@@ -28,16 +28,6 @@ RSpec.shared_examples 'rejects nuget packages access with packages features disa ...@@ -28,16 +28,6 @@ RSpec.shared_examples 'rejects nuget packages access with packages features disa
end end
end end
RSpec.shared_examples 'rejects nuget packages access with feature flag disabled' do
context 'with feature flag disabled' do
before do
stub_feature_flags(nuget_package_registry: { enabled: false, thing: project })
end
it_behaves_like 'rejects nuget packages access', :anonymous, :not_found
end
end
RSpec.shared_examples 'process nuget service index request' do |user_type, status, add_member = true| RSpec.shared_examples 'process nuget service index request' do |user_type, status, add_member = true|
context "for user type #{user_type}" do context "for user type #{user_type}" do
before do before do
......
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