diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-09-28 16:13:42 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-09-28 16:13:42 +0000 |
| commit | 1ed5ab50c7931cee1283b21512784a487668a27f (patch) | |
| tree | 2e62fc00f9f7a5091220fa3cc9d5042f885661e1 | |
| parent | ab6b4488033e6291ba1c2295ea87884ff37e7508 (diff) | |
| parent | 73bdca2e03f559d8603fcd828f82fa4893fdcfa1 (diff) | |
| download | gitlab-ce-1ed5ab50c7931cee1283b21512784a487668a27f.tar.gz | |
Merge branch '51404-update-groups-and-projects-api-docs' into 'master'
Docs for Project/Groups members API with inherited members
Closes #51404
See merge request gitlab-org/gitlab-ce!21984
| -rw-r--r-- | changelogs/unreleased/51404-update-groups-and-projects-api-docs.yml | 5 | ||||
| -rw-r--r-- | doc/api/members.md | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/51404-update-groups-and-projects-api-docs.yml b/changelogs/unreleased/51404-update-groups-and-projects-api-docs.yml new file mode 100644 index 00000000000..da02a91041b --- /dev/null +++ b/changelogs/unreleased/51404-update-groups-and-projects-api-docs.yml @@ -0,0 +1,5 @@ +--- +title: Docs for Project/Groups members API with inherited members +merge_request: 21984 +author: Jacopo Beschi @jacopo-beschi +type: added diff --git a/doc/api/members.md b/doc/api/members.md index 7b228b92594..bb4fae35f52 100644 --- a/doc/api/members.md +++ b/doc/api/members.md @@ -15,6 +15,7 @@ The access levels are defined in the `Gitlab::Access` module. Currently, these l ## List all members of a group or project Gets a list of group or project members viewable by the authenticated user. +Returns only direct members and not inherited members through ancestors groups. ``` GET /groups/:id/members @@ -61,6 +62,7 @@ Example response: ## List all members of a group or project including inherited members Gets a list of group or project members viewable by the authenticated user, including inherited members through ancestor groups. +Returns multiple times the same user (with different member attributes) when the user is a member of the project/group and of one or more ancestor group. ``` GET /groups/:id/members/all |