From dc00fa90e95916719bfcfeb5bdca9f0b590ca467 Mon Sep 17 00:00:00 2001 From: Sara Ahbabou Date: Fri, 12 Apr 2019 05:00:50 +0000 Subject: Squashed commits and modified visibility level output Added changelog and rebased --- app/services/groups/create_service.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/services/groups/create_service.rb') diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index 74aad3b1c94..8f1f25a7307 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -62,12 +62,16 @@ module Groups end def can_use_visibility_level? - unless Gitlab::VisibilityLevel.allowed_for?(current_user, params[:visibility_level]) + unless Gitlab::VisibilityLevel.allowed_for?(current_user, visibility_level) deny_visibility_level(@group) return false end true end + + def visibility_level + params[:visibility].present? ? Gitlab::VisibilityLevel.level_value(params[:visibility]) : params[:visibility_level] + end end end -- cgit v1.2.3