diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
commit | 1ce6af4aad0107b6d604f89a3c0b530476a10165 (patch) | |
tree | 4956b0d395cd9232bca14f83daca3cd8616cc842 /doc/user/admin_area/activating_deactivating_users.md | |
parent | 24256212ea84e6fb6509f6fb317a2d2bac3d0d06 (diff) | |
download | gitlab-ce-1ce6af4aad0107b6d604f89a3c0b530476a10165.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area/activating_deactivating_users.md')
-rw-r--r-- | doc/user/admin_area/activating_deactivating_users.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/admin_area/activating_deactivating_users.md b/doc/user/admin_area/activating_deactivating_users.md index 78a07f4a04e..5836129b222 100644 --- a/doc/user/admin_area/activating_deactivating_users.md +++ b/doc/user/admin_area/activating_deactivating_users.md @@ -38,7 +38,7 @@ Please note that for the deactivation option to be visible to an admin, the user - Must be currently active. - Should not have any activity in the last 180 days. -Users can also be deactivated using the [GitLab API](../../api/users.html#deactivate-user). +Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user). NOTE: **Note:** A deactivated user does not consume a [seat](../../subscriptions/index.md#managing-subscriptions). @@ -56,7 +56,7 @@ To do this: 1. Select a user. 1. Under the **Account** tab, click **Activate user**. -Users can also be activated using the [GitLab API](../../api/users.html#activate-user). +Users can also be activated using the [GitLab API](../../api/users.md#activate-user). NOTE: **Note:** Activating a user will change the user's state to active and it consumes a |