Commit 051cccd6 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-unblock-ldap-users' into 'master'

Document how to unblock LDAP users

See merge request gitlab-org/gitlab!77333
parents c89209a1 3427846d
...@@ -100,7 +100,7 @@ A blocked user can be unblocked from the Admin Area. To do this: ...@@ -100,7 +100,7 @@ A blocked user can be unblocked from the Admin Area. To do this:
1. On the top bar, select **Menu > Admin**. 1. On the top bar, select **Menu > Admin**.
1. On the left sidebar, select **Overview > Users**. 1. On the left sidebar, select **Overview > Users**.
1. Select on the **Blocked** tab. 1. Select the **Blocked** tab.
1. Optional. Select a user. 1. Optional. Select a user.
1. Select the **{settings}** **User administration** dropdown. 1. Select the **{settings}** **User administration** dropdown.
1. Select **Unblock**. 1. Select **Unblock**.
...@@ -111,6 +111,16 @@ The user's state is set to active and they consume a ...@@ -111,6 +111,16 @@ The user's state is set to active and they consume a
NOTE: NOTE:
Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-user). Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-user).
The unblock option may be unavailable for LDAP users. To enable the unblock option,
the LDAP identity first needs to be deleted:
1. On the top bar, select **Menu > Admin**.
1. On the left sidebar, select **Overview > Users**.
1. Select the **Blocked** tab.
1. Select a user.
1. Select the **Identities** tab.
1. Find the LDAP provider and select **Delete**.
## Activate and deactivate users ## Activate and deactivate users
GitLab administrators can deactivate and activate users. GitLab administrators can deactivate and activate users.
......
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