Commit 4940c6be authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'cat-master-patch-48090' into 'master'

Update example output in namespaces API

Closes #196778

See merge request gitlab-org/gitlab!38588
parents 4951b552 454b1986
......@@ -31,7 +31,14 @@ Example response:
"name": "user1",
"path": "user1",
"kind": "user",
"full_path": "user1"
"full_path": "user1",
"parent_id": null,
"avatar_url": "https://secure.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
"web_url": "https://gitlab.example.com/user1",
"billable_members_count": 1,
"plan": "default",
"trial_ends_on": null,
"trial": false
},
{
"id": 2,
......@@ -40,7 +47,13 @@ Example response:
"kind": "group",
"full_path": "group1",
"parent_id": null,
"members_count_with_descendants": 2
"avatar_url": null,
"web_url": "https://gitlab.example.com/groups/group1",
"members_count_with_descendants": 2,
"billable_members_count": 2,
"plan": "default",
"trial_ends_on": null,
"trial": false
},
{
"id": 3,
......@@ -49,7 +62,13 @@ Example response:
"kind": "group",
"full_path": "foo/bar",
"parent_id": 9,
"members_count_with_descendants": 5
"avatar_url": null,
"web_url": "https://gitlab.example.com/groups/foo/bar",
"members_count_with_descendants": 5,
"billable_members_count": 5,
"plan": "default",
"trial_ends_on": null,
"trial": false
}
]
```
......@@ -100,7 +119,13 @@ Example response:
"kind": "group",
"full_path": "twitter",
"parent_id": null,
"members_count_with_descendants": 2
"avatar_url": null,
"web_url": "https://gitlab.example.com/groups/twitter",
"members_count_with_descendants": 2,
"billable_members_count": 2,
"plan": "default",
"trial_ends_on": null,
"trial": false
}
]
```
......@@ -133,7 +158,13 @@ Example response:
"kind": "group",
"full_path": "group1",
"parent_id": null,
"members_count_with_descendants": 2
"avatar_url": null,
"web_url": "https://gitlab.example.com/groups/group1",
"members_count_with_descendants": 2,
"billable_members_count": 2,
"plan": "default",
"trial_ends_on": null,
"trial": false
}
```
......@@ -153,6 +184,12 @@ Example response:
"kind": "group",
"full_path": "group1",
"parent_id": null,
"members_count_with_descendants": 2
"avatar_url": null,
"web_url": "https://gitlab.example.com/groups/group1",
"members_count_with_descendants": 2,
"billable_members_count": 2,
"plan": "default",
"trial_ends_on": null,
"trial": false
}
```
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment