Commit 8f15b67a authored by Suzanne Selhorn's avatar Suzanne Selhorn

Merge branch 'poffey21-master-patch-71938' into 'master'

Add details regarding license consumption

See merge request gitlab-org/gitlab!72018
parents 92802835 7f193b6d
...@@ -39,7 +39,9 @@ the LDAP server, or share email addresses. ...@@ -39,7 +39,9 @@ the LDAP server, or share email addresses.
### User deletion ### User deletion
Users deleted from the LDAP server are immediately blocked from signing in Users deleted from the LDAP server are immediately blocked from signing in
to GitLab. However, there's an LDAP check cache time of one hour (which is to GitLab and [no longer consumes a
license](../../../user/admin_area/moderate_users.md).
However, there's an LDAP check cache time of one hour (which is
[configurable](#adjust-ldap-user-sync-schedule) for GitLab Premium users). [configurable](#adjust-ldap-user-sync-schedule) for GitLab Premium users).
This means users already signed-in or who are using Git over SSH can access This means users already signed-in or who are using Git over SSH can access
GitLab for up to one hour. Manually block the user in the GitLab Admin Area GitLab for up to one hour. Manually block the user in the GitLab Admin Area
......
...@@ -73,7 +73,7 @@ In order to completely prevent access of a user to the GitLab instance, ...@@ -73,7 +73,7 @@ In order to completely prevent access of a user to the GitLab instance,
administrators can choose to block the user. administrators can choose to block the user.
Users can be blocked [via an abuse report](review_abuse_reports.md#blocking-users), Users can be blocked [via an abuse report](review_abuse_reports.md#blocking-users),
or directly from the Admin Area. To do this: by removing them in LDAP, or directly 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**.
......
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