diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-30 16:49:22 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-30 16:49:22 +0100 |
| commit | 4d2d744ae9a2d4c3bb0f00805c27704b79e00d72 (patch) | |
| tree | 839b1c3ab4c09c80f7d643fe69dae8a83c4e4eb4 /lib/api/groups.rb | |
| parent | 25a3b7fab905d09f6f064108f457a4e20c8915ff (diff) | |
| parent | f7c8434c7100c3c87eb2a75cd5a128e520d8c110 (diff) | |
| download | gitlab-ce-enable-new-navigaton-by-default.tar.gz | |
Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-default
Diffstat (limited to 'lib/api/groups.rb')
| -rw-r--r-- | lib/api/groups.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index e56427304a6..8c494a54329 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -7,7 +7,11 @@ module API helpers do params :optional_params_ce do optional :description, type: String, desc: 'The description of the group' - optional :visibility, type: String, values: Gitlab::VisibilityLevel.string_values, desc: 'The visibility of the group' + optional :visibility, type: String, + values: Gitlab::VisibilityLevel.string_values, + default: Gitlab::VisibilityLevel.string_level( + Gitlab::CurrentSettings.current_application_settings.default_group_visibility), + desc: 'The visibility of the group' optional :lfs_enabled, type: Boolean, desc: 'Enable/disable LFS for the projects in this group' optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access' optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group' @@ -118,8 +122,9 @@ module API group = find_group!(params[:id]) authorize! :admin_group, group - status 204 - ::Groups::DestroyService.new(group, current_user).execute + destroy_conditionally!(group) do |group| + ::Groups::DestroyService.new(group, current_user).execute + end end desc 'Get a list of projects in this group.' do |