diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-22 01:24:52 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-22 01:24:52 +0000 |
| commit | 3a78f7caa0523190acb09c5ed91eab3e19da62ab (patch) | |
| tree | 8d903905022ad537aa46aee7cd0b7f8f239aa23e /lib/api/entities.rb | |
| parent | 0305dd98b32b5a989f2b84e0810cf5ddc14abd7f (diff) | |
| parent | 503244eb9638bb141e3883d40281d7188fe8c02e (diff) | |
| download | gitlab-ce-3a78f7caa0523190acb09c5ed91eab3e19da62ab.tar.gz | |
Merge branch 'issue_12658' into 'master'
Add group visibility level
Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051
Closes #12658
See merge request !3323
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 71197205f34..197e826e5bc 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -85,7 +85,7 @@ module API end class Group < Grape::Entity - expose :id, :name, :path, :description + expose :id, :name, :path, :description, :visibility_level expose :avatar_url expose :web_url do |group, options| @@ -340,6 +340,7 @@ module API expose :session_expire_delay expose :default_project_visibility expose :default_snippet_visibility + expose :default_group_visibility expose :restricted_signup_domains expose :user_oauth_applications expose :after_sign_out_path |