diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-30 10:04:00 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-30 10:04:00 +0000 |
commit | 2f1ef2be6f7d0b28341bfbf533c663b2fcbb7465 (patch) | |
tree | 66484dafe8798f2f0f7dde81a69bb8debf442e19 | |
parent | f11049ab9131b78c14e95bd95b3073c1eaf59392 (diff) | |
parent | 9edaff0d3547ba9854e69655a4ae4d5095b8a25f (diff) | |
download | gitlab-ce-2f1ef2be6f7d0b28341bfbf533c663b2fcbb7465.tar.gz |
Merge branch '37198-api-doesn-t-respect-default-group-visibility' into 'master'
Respect the default visibility level when creating a group via the API
Closes #37198
See merge request !13903
-rw-r--r-- | changelogs/unreleased/37198-api-doesn-t-respect-default-group-visibility.yml | 5 | ||||
-rw-r--r-- | lib/api/groups.rb | 6 | ||||
-rw-r--r-- | spec/requests/api/groups_spec.rb | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/changelogs/unreleased/37198-api-doesn-t-respect-default-group-visibility.yml b/changelogs/unreleased/37198-api-doesn-t-respect-default-group-visibility.yml new file mode 100644 index 00000000000..ef83dc1d10a --- /dev/null +++ b/changelogs/unreleased/37198-api-doesn-t-respect-default-group-visibility.yml @@ -0,0 +1,5 @@ +--- +title: 'API: Respect default group visibility when creating a group' +merge_request: 13903 +author: Robert Schilling +type: fixed diff --git a/lib/api/groups.rb b/lib/api/groups.rb index ee2ad27837b..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' diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb index 39d76cdbc74..77c43f92456 100644 --- a/spec/requests/api/groups_spec.rb +++ b/spec/requests/api/groups_spec.rb @@ -444,6 +444,7 @@ describe API::Groups do expect(json_response["name"]).to eq(group[:name]) expect(json_response["path"]).to eq(group[:path]) expect(json_response["request_access_enabled"]).to eq(group[:request_access_enabled]) + expect(json_response["visibility"]).to eq(Gitlab::VisibilityLevel.string_level(Gitlab::CurrentSettings.current_application_settings.default_group_visibility)) end it "creates a nested group", :nested_groups do |