diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-15 09:41:45 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-15 09:41:45 +0000 |
| commit | 6038355f9e802f5078e19d31166e2c05b7b21af1 (patch) | |
| tree | 5ec27ce06e35a15f88809b2602d5465b131a96a3 /doc/api | |
| parent | fea03a73cfa46afa7973e38222110e12674f78cf (diff) | |
| parent | dcdab2ae1a73728847bdc94f681ad0a7f45666c5 (diff) | |
| download | gitlab-ce-6038355f9e802f5078e19d31166e2c05b7b21af1.tar.gz | |
Merge branch 'dz-nested-groups-improvements-3' into 'master'
Nested groups improvements pt 3
See merge request !9227
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/namespaces.md | 9 | ||||
| -rw-r--r-- | doc/api/projects.md | 23 |
2 files changed, 23 insertions, 9 deletions
diff --git a/doc/api/namespaces.md b/doc/api/namespaces.md index 88cd407d792..1d97b5de688 100644 --- a/doc/api/namespaces.md +++ b/doc/api/namespaces.md @@ -35,6 +35,12 @@ Example response: "id": 2, "path": "group1", "kind": "group" + }, + { + "id": 3, + "path": "bar", + "kind": "group", + "full_path": "foo/bar", } ] ``` @@ -64,7 +70,8 @@ Example response: { "id": 4, "path": "twitter", - "kind": "group" + "kind": "group", + "full_path": "twitter", } ] ``` diff --git a/doc/api/projects.md b/doc/api/projects.md index fa51158956a..b3136be6731 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -77,7 +77,8 @@ Parameters: "id": 3, "name": "Diaspora", "path": "diaspora", - "kind": "group" + "kind": "group", + "full_path": "diaspora" }, "archived": false, "avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png", @@ -127,7 +128,8 @@ Parameters: "id": 4, "name": "Brightbox", "path": "brightbox", - "kind": "group" + "kind": "group", + "full_path": "brightbox" }, "permissions": { "project_access": { @@ -207,7 +209,8 @@ Parameters: "id": 3, "name": "Diaspora", "path": "diaspora", - "kind": "group" + "kind": "group", + "full_path": "diaspora" }, "permissions": { "project_access": { @@ -585,7 +588,8 @@ Example response: "id": 3, "name": "Diaspora", "path": "diaspora", - "kind": "group" + "kind": "group", + "full_path": "diaspora" }, "archived": true, "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", @@ -650,7 +654,8 @@ Example response: "id": 3, "name": "Diaspora", "path": "diaspora", - "kind": "group" + "kind": "group", + "full_path": "diaspora" }, "archived": true, "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", @@ -721,7 +726,8 @@ Example response: "id": 3, "name": "Diaspora", "path": "diaspora", - "kind": "group" + "kind": "group", + "full_path": "diaspora" }, "permissions": { "project_access": { @@ -803,7 +809,8 @@ Example response: "id": 3, "name": "Diaspora", "path": "diaspora", - "kind": "group" + "kind": "group", + "full_path": "diaspora" }, "permissions": { "project_access": { @@ -1187,4 +1194,4 @@ Parameters: | --------- | ---- | -------- | ----------- | | `query` | string | yes | A string contained in the project name | | `order_by` | string | no | Return requests ordered by `id`, `name`, `created_at` or `last_activity_at` fields | -| `sort` | string | no | Return requests sorted in `asc` or `desc` order | +| `sort` | string | no | Return requests sorted in `asc` or `desc` order |
\ No newline at end of file |