diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:09:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:09:03 +0000 |
commit | 5366964a10484c2783a646b35a6da9eece01b242 (patch) | |
tree | 4a5a7a289d44e63d96a50a6a64db6e16b871f19c /doc/api | |
parent | 733befe96ad19f5a02e442c4a9cc8059d3aabbda (diff) | |
download | gitlab-ce-5366964a10484c2783a646b35a6da9eece01b242.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/groups.md | 22 | ||||
-rw-r--r-- | doc/api/users.md | 13 |
2 files changed, 32 insertions, 3 deletions
diff --git a/doc/api/groups.md b/doc/api/groups.md index 3d2ac8c1e18..de0b2543645 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -798,7 +798,7 @@ DELETE /groups/:id/hooks/:hook_id Group audit events can be accessed via the [Group Audit Events API](audit_events.md#group-audit-events-starter) -## Sync group with LDAP **(CORE ONLY)** +## Sync group with LDAP **(STARTER)** Syncs the group with its linked LDAP group. Only available to group owners and administrators. @@ -814,7 +814,23 @@ Parameters: Please consult the [Group Members](members.md) documentation. -### Add LDAP group link **(CORE ONLY)** +## LDAP Group Links + +List, add, and delete LDAP group links. + +### List LDAP group links **(STARTER)** + +Lists LDAP group links. + +``` +GET /groups/:id/ldap_group_links +``` + +Parameters: + +- `id` (required) - The ID of a group + +### Add LDAP group link **(STARTER)** Adds an LDAP group link. @@ -829,7 +845,7 @@ Parameters: - `group_access` (required) - Minimum access level for members of the LDAP group - `provider` (required) - LDAP provider for the LDAP group -### Delete LDAP group link **(CORE ONLY)** +### Delete LDAP group link **(STARTER)** Deletes an LDAP group link. diff --git a/doc/api/users.md b/doc/api/users.md index 2dd07ab8a4e..701929520f4 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -437,6 +437,19 @@ Note, at the moment this method does only return a `404` error, even in cases where a `409` (Conflict) would be more appropriate, e.g. when renaming the email address to some existing one. +## Delete authentication identity from user + +Deletes a user's authentication identity using the provider name associated with that identity. Available only for administrators. + +``` +DELETE /users/:id/identities/:provider +``` + +Parameters: + +- `id` (required) - The ID of the user +- `provider` (required) - External provider name + ## User deletion Deletes a user. Available only for administrators. |