Commit 922c9f44 authored by Mike Jang's avatar Mike Jang

Merge branch 'ricardoamarilla-master-patch-53027' into 'master'

LDAP Group Links available only in Starter and higher self-managed tiers

See merge request gitlab-org/gitlab!46285
parents d867bfec 9a8eefe5
......@@ -1119,7 +1119,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)
## Sync group with LDAP **(STARTER)**
## Sync group with LDAP **(STARTER ONLY)**
Syncs the group with its linked LDAP group. Only available to group owners and administrators.
......@@ -1139,7 +1139,7 @@ Please consult the [Group Members](members.md) documentation.
List, add, and delete LDAP group links.
### List LDAP group links **(STARTER)**
### List LDAP group links **(STARTER ONLY)**
Lists LDAP group links.
......@@ -1151,7 +1151,7 @@ GET /groups/:id/ldap_group_links
| --------- | -------------- | -------- | ----------- |
| `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) |
### Add LDAP group link with CN or filter **(STARTER)**
### Add LDAP group link with CN or filter **(STARTER ONLY)**
Adds an LDAP group link using a CN or filter. Adding a group link by filter is only supported in the Premium tier and above.
......@@ -1170,7 +1170,7 @@ POST /groups/:id/ldap_group_links
NOTE: **Note:**
To define the LDAP group link, provide either a `cn` or a `filter`, but not both.
### Delete LDAP group link **(STARTER)**
### Delete LDAP group link **(STARTER ONLY)**
Deletes an LDAP group link. Deprecated. Will be removed in a future release.
......@@ -1195,7 +1195,7 @@ DELETE /groups/:id/ldap_group_links/:provider/:cn
| `cn` | string | yes | The CN of an LDAP group |
| `provider` | string | yes | LDAP provider for the LDAP group link |
### Delete LDAP group link with CN or filter **(STARTER)**
### Delete LDAP group link with CN or filter **(STARTER ONLY)**
Deletes an LDAP group link using a CN or filter. Deleting by filter is only supported in the Premium tier and above.
......
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