Merge branch 'dz-nested-groups-api' into 'master'

Nested groups API

See merge request !9034

2 files changed, 2 insertions, 0 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5d7b8e021bb..3a5819d1bab 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -138,6 +138,7 @@ module API
       expose :web_url
       expose :request_access_enabled
       expose :full_name, :full_path
+      expose :parent_id
 
       expose :statistics, if: :statistics do
         with_options format_with: -> (value) { value.to_i } do
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 50dadd94b04..5c132bdd6f9 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -73,6 +73,7 @@ module API
       params do
         requires :name, type: String, desc: 'The name of the group'
         requires :path, type: String, desc: 'The path of the group'
+        optional :parent_id, type: Integer, desc: 'The parent group id for creating nested group'
         use :optional_params
       end
       post do