diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-04 21:09:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-04 21:09:30 +0300 |
commit | 496cdee0e3a2d341ccd7b1ead9654dfe35215809 (patch) | |
tree | 16f0f95626155d4157a423609543dbc170f7d5dd /app/services/groups | |
parent | 07516504537bef518a3f80b60ebca761209feab5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/groups')
-rw-r--r-- | app/services/groups/base_service.rb | 4 | ||||
-rw-r--r-- | app/services/groups/create_service.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/groups/base_service.rb b/app/services/groups/base_service.rb index 06136aff50e..9705f3a560d 100644 --- a/app/services/groups/base_service.rb +++ b/app/services/groups/base_service.rb @@ -13,11 +13,11 @@ module Groups private def handle_namespace_settings - settings_params = params.slice(*::NamespaceSetting::NAMESPACE_SETTINGS_PARAMS) + settings_params = params.slice(*::NamespaceSetting.allowed_namespace_settings_params) return if settings_params.empty? - ::NamespaceSetting::NAMESPACE_SETTINGS_PARAMS.each do |nsp| + ::NamespaceSetting.allowed_namespace_settings_params.each do |nsp| params.delete(nsp) end diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index 639f7c68c40..35716f7742a 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -13,7 +13,7 @@ module Groups remove_unallowed_params set_visibility_level - @group = Group.new(params.except(*::NamespaceSetting::NAMESPACE_SETTINGS_PARAMS)) + @group = Group.new(params.except(*::NamespaceSetting.allowed_namespace_settings_params)) @group.build_namespace_settings handle_namespace_settings |