Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-07 09:10:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-07 09:10:43 +0300
commita158bebe03b366b6463af181b9ee6f6c2b3850a3 (patch)
treeae65950cccfa3d99292a5c083df0cf786c74dd2b /app/services/namespaces
parent170765911848f0ad68e0f26f6413dd770d36f364 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/namespaces')
-rw-r--r--app/services/namespaces/package_settings/update_service.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/namespaces/package_settings/update_service.rb b/app/services/namespaces/package_settings/update_service.rb
index 0964963647a..cbadbe5c907 100644
--- a/app/services/namespaces/package_settings/update_service.rb
+++ b/app/services/namespaces/package_settings/update_service.rb
@@ -5,7 +5,10 @@ module Namespaces
class UpdateService < BaseContainerService
include Gitlab::Utils::StrongMemoize
- ALLOWED_ATTRIBUTES = %i[maven_duplicates_allowed maven_duplicate_exception_regex].freeze
+ ALLOWED_ATTRIBUTES = %i[maven_duplicates_allowed
+ maven_duplicate_exception_regex
+ generic_duplicates_allowed
+ generic_duplicate_exception_regex].freeze
def execute
return ServiceResponse.error(message: 'Access Denied', http_status: 403) unless allowed?