diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-19 15:53:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-19 15:53:40 +0000 |
| commit | b94de5fd555213ae28030c33c27440228f8efb65 (patch) | |
| tree | 6d28b8b28e5bea149d17a897bc2e20b995b17404 /lib/api/entities.rb | |
| parent | bb6b1659adb74cec3991320f7dcb4b537c57b13a (diff) | |
| parent | e0067d185005f563b0f8dad9e150d922419c0ea2 (diff) | |
| download | gitlab-ce-b94de5fd555213ae28030c33c27440228f8efb65.tar.gz | |
Merge branch 'issue_20978' into 'master'
Allow to set request_access_enabled for groups and projects using API
Closes #20978
See merge request !6359
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index bfee4b6c752..0235ba3d580 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -100,6 +100,7 @@ module API SharedGroup.represent(project.project_group_links.all, options) end expose :only_allow_merge_if_build_succeeds + expose :request_access_enabled end class Member < UserBasic @@ -125,6 +126,7 @@ module API expose :lfs_enabled?, as: :lfs_enabled expose :avatar_url expose :web_url + expose :request_access_enabled end class GroupDetail < Group |