diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 03:09:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 03:09:07 +0000 |
| commit | d393deba773bb1fab09273850fe5d5986066d76d (patch) | |
| tree | b08d599196d09a91561f6f43b9c5660987060ecb /doc/api | |
| parent | 32fd4cd5e2134511936899d6bcc4aaf18b9be6fd (diff) | |
| download | gitlab-ce-d393deba773bb1fab09273850fe5d5986066d76d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/groups.md | 2 | ||||
| -rw-r--r-- | doc/api/users.md | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/api/groups.md b/doc/api/groups.md index 14e04b9dd17..4c287386c59 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -498,7 +498,7 @@ Parameters: ## Transfer project to group -Transfer a project to the Group namespace. Available only to instance administrators. Transferring projects may fail when tagged packages exist in the project's repository. +Transfer a project to the Group namespace. Available only to instance administrators, although an [alternative API endpoint](projects.md#transfer-a-project-to-a-new-namespace) is available which does not require instance administrator access. Transferring projects may fail when tagged packages exist in the project's repository. ``` POST /groups/:id/projects/:project_id diff --git a/doc/api/users.md b/doc/api/users.md index d9fcaafc30f..ecd3c306d81 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -1435,14 +1435,14 @@ Please note that `last_activity_at` is deprecated, please use `last_activity_on` ## User memberships (admin only) -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22518) in GitLab 12.8. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/20532) in GitLab 12.8. Lists all projects and groups a user is a member of. This endpoint is available for admins only. It returns the `source_id`, `source_name`, `source_type` and `access_level` of a membership. -Source can be of type `Namespace` (representing a group) or `Project`. The response represents only direct memberships. Inherited memberships, for example in subgroups, will not be included. -Access levels will be represented by an integer value. Read more about the meaning of access level values [here](access_requests.md#valid-access-levels). +Source can be of type `Namespace` (representing a group) or `Project`. The response represents only direct memberships. Inherited memberships, for example in subgroups, are not included. +Access levels are represented by an integer value. For more details, read about the meaning of [access level values](access_requests.md#valid-access-levels). -``` +```plaintext GET /users/:id/memberships ``` @@ -1456,7 +1456,7 @@ Parameters: Returns: - `200 OK` on success. -- `404 User Not Found` if user cannot be found. +- `404 User Not Found` if user can't be found. - `403 Forbidden` when not requested by an admin. - `400 Bad Request` when requested type is not supported. |