diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-29 15:49:56 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-29 15:49:56 +0000 |
| commit | 26bcef97d64f449b5073ac767c02961763c20b18 (patch) | |
| tree | 4a0ba9af1b670ee1c2743ff37988799142c33ff5 /lib/api/v3/entities.rb | |
| parent | 7dc8961af99d2a30b0a3210f7a4ee43c8779c6d2 (diff) | |
| parent | 27d5f99e508024b5c2fb8509f83e8e4c6a214865 (diff) | |
| download | gitlab-ce-26bcef97d64f449b5073ac767c02961763c20b18.tar.gz | |
Merge branch 'rework-authorizations-performance' into 'master'
Rework project authorizations and nested groups for better performance
See merge request !10885
Diffstat (limited to 'lib/api/v3/entities.rb')
| -rw-r--r-- | lib/api/v3/entities.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/api/v3/entities.rb b/lib/api/v3/entities.rb index 332f233bf5e..2e1b243c2db 100644 --- a/lib/api/v3/entities.rb +++ b/lib/api/v3/entities.rb @@ -137,7 +137,10 @@ module API expose :web_url expose :request_access_enabled expose :full_name, :full_path - expose :parent_id + + if ::Group.supports_nested_groups? + expose :parent_id + end expose :statistics, if: :statistics do with_options format_with: -> (value) { value.to_i } do |