From 585826cb22ecea5998a2c2a4675735c94bdeedac Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Nov 2023 08:41:52 +0000 Subject: Add latest changes from gitlab-org/gitlab@16-6-stable-ee --- app/graphql/mutations/namespace/package_settings/update.rb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'app/graphql/mutations/namespace/package_settings/update.rb') diff --git a/app/graphql/mutations/namespace/package_settings/update.rb b/app/graphql/mutations/namespace/package_settings/update.rb index 4e71bed52c6..97c16ee79fe 100644 --- a/app/graphql/mutations/namespace/package_settings/update.rb +++ b/app/graphql/mutations/namespace/package_settings/update.rb @@ -8,8 +8,6 @@ module Mutations include Mutations::ResolvesNamespace - NUGET_DUPLICATES_FF_ERROR = '`nuget_duplicates_option` feature flag is disabled.' - description <<~DESC These settings can be adjusted by the group Owner or Maintainer. [Issue 370471](https://gitlab.com/gitlab-org/gitlab/-/issues/370471) proposes limiting @@ -91,10 +89,6 @@ module Mutations def resolve(namespace_path:, **args) namespace = authorized_find!(namespace_path: namespace_path) - if nuget_duplicate_settings_present?(args) && Feature.disabled?(:nuget_duplicates_option, namespace) - raise_resource_not_available_error! NUGET_DUPLICATES_FF_ERROR - end - result = ::Namespaces::PackageSettings::UpdateService .new(container: namespace, current_user: current_user, params: args) .execute @@ -110,10 +104,6 @@ module Mutations def find_object(namespace_path:) resolve_namespace(full_path: namespace_path) end - - def nuget_duplicate_settings_present?(args) - args.key?(:nuget_duplicates_allowed) || args.key?(:nuget_duplicate_exception_regex) - end end end end -- cgit v1.2.3