Commit e2b7fa7b authored by Evan Read's avatar Evan Read Committed by Russell Dickenson

Edit to blocking and deactivating users

parent 5ef0f345
...@@ -4,13 +4,17 @@ type: howto ...@@ -4,13 +4,17 @@ type: howto
# Activating and deactivating users # Activating and deactivating users
GitLab administrators can deactivate and activate users.
## Deactivating a user ## Deactivating a user
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/63921) in GitLab 12.4. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/63921) in GitLab 12.4.
In order to temporarily prevent access by a GitLab user that has no recent activity, administrators can choose to deactivate the user. In order to temporarily prevent access by a GitLab user that has no recent activity, administrators
can choose to deactivate the user.
Deactivating a user is functionally identical to [blocking a user](blocking_unblocking_users.md), with the following differences: Deactivating a user is functionally identical to [blocking a user](blocking_unblocking_users.md),
with the following differences:
- It does not prohibit the user from logging back in via the UI. - It does not prohibit the user from logging back in via the UI.
- Once a deactivated user logs back into the GitLab UI, their account is set to active. - Once a deactivated user logs back into the GitLab UI, their account is set to active.
...@@ -19,11 +23,11 @@ A deactivated user: ...@@ -19,11 +23,11 @@ A deactivated user:
- Cannot access Git repositories or the API. - Cannot access Git repositories or the API.
- Will not receive any notifications from GitLab. - Will not receive any notifications from GitLab.
- Will not be able to use [slash commands](../../../integration/slash_commands.md). - Will not be able to use [slash commands](../../integration/slash_commands.md).
Personal projects, group and user history of the deactivated user will be left intact. Personal projects, and group and user history of the deactivated user will be left intact.
A user can be deactivated from the Admin area. To do this: A user can be deactivated from the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**. 1. Navigate to **Admin Area > Overview > Users**.
1. Select a user. 1. Select a user.
...@@ -34,16 +38,16 @@ Please note that for the deactivation option to be visible to an admin, the user ...@@ -34,16 +38,16 @@ Please note that for the deactivation option to be visible to an admin, the user
- Must be currently active. - Must be currently active.
- Should not have any activity in the last 180 days. - 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.html#deactivate-user).
NOTE: **Note:** NOTE: **Note:**
A deactivated user does not consume a [seat](../../../subscriptions/index.md#managing-subscriptions). A deactivated user does not consume a [seat](../../subscriptions/index.md#managing-subscriptions).
## Activating a user ## Activating a user
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/63921) in GitLab 12.4. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/63921) in GitLab 12.4.
A deactivated user can be activated from the Admin area. A deactivated user can be activated from the Admin Area.
To do this: To do this:
...@@ -52,10 +56,11 @@ To do this: ...@@ -52,10 +56,11 @@ To do this:
1. Select a user. 1. Select a user.
1. Under the **Account** tab, click **Activate 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.html#activate-user).
NOTE: **Note:** NOTE: **Note:**
Activating a user will change the user's state to active and it consumes a [seat](../../../subscriptions/index.md#managing-subscriptions). Activating a user will change the user's state to active and it consumes a
[seat](../../subscriptions/index.md#managing-subscriptions).
TIP: **Tip:** TIP: **Tip:**
A deactivated user can also activate their account by themselves by simply logging back via the UI. A deactivated user can also activate their account by themselves by simply logging back via the UI.
...@@ -4,12 +4,15 @@ type: howto ...@@ -4,12 +4,15 @@ type: howto
# Blocking and unblocking users # Blocking and unblocking users
GitLab administrators block and unblock users.
## Blocking a user ## Blocking a user
Inorder to completely prevent access of a user to the GitLab instance, admin can choose to block the user. In order to completely prevent access of a user to the GitLab instance, administrators can choose to
block the user.
Users can be blocked [via an abuse report](../../admin_area/abuse_reports.md#blocking-users), Users can be blocked [via an abuse report](abuse_reports.md#blocking-users),
or directly from the Admin area. To do this: or directly from the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**. 1. Navigate to **Admin Area > Overview > Users**.
1. Select a user. 1. Select a user.
...@@ -20,25 +23,26 @@ A blocked user: ...@@ -20,25 +23,26 @@ A blocked user:
- Will not be able to login. - Will not be able to login.
- Cannot access Git repositories or the API. - Cannot access Git repositories or the API.
- Will not receive any notifications from GitLab. - Will not receive any notifications from GitLab.
- Will not be able to use [slash commands](../../../integration/slash_commands.md). - Will not be able to use [slash commands](../../integration/slash_commands.md).
Personal projects, group and user history of the blocked user will be left intact. Personal projects, and group and user history of the blocked user will be left intact.
Users can also be blocked using the [GitLab API](../../../api/users.html#block-user). Users can also be blocked using the [GitLab API](../../api/users.html#block-user).
NOTE: **Note:** NOTE: **Note:**
A blocked user does not consume a [seat](../../../subscriptions/index.md#managing-subscriptions). A blocked user does not consume a [seat](../../subscriptions/index.md#managing-subscriptions).
## Unblocking a user ## Unblocking a user
A blocked user can be unblocked from the Admin area. To do this: A blocked user can be unblocked from the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**. 1. Navigate to **Admin Area > Overview > Users**.
1. Click on the **Blocked** tab. 1. Click on the **Blocked** tab.
1. Select a user. 1. Select a user.
1. Under the **Account** tab, click **Unblock user**. 1. Under the **Account** tab, click **Unblock user**.
Users can also be unblocked using the [GitLab API](../../../api/users.html#unblock-user). Users can also be unblocked using the [GitLab API](../../api/users.html#unblock-user).
NOTE: **Note:** NOTE: **Note:**
Unblocking a user will change the user's state to active and it consumes a [seat](../../../subscriptions/index.md#managing-subscriptions). Unblocking a user will change the user's state to active and it consumes a
[seat](../../subscriptions/index.md#managing-subscriptions).
...@@ -112,8 +112,8 @@ To list users matching a specific criteria, click on one of the following tabs o ...@@ -112,8 +112,8 @@ To list users matching a specific criteria, click on one of the following tabs o
- **2FA Enabled** - **2FA Enabled**
- **2FA Disabled** - **2FA Disabled**
- **External** - **External**
- **[Blocked](../profile/account/blocking_unblocking_users.md)** - **[Blocked](blocking_unblocking_users.md)**
- **[Deactivated](../profile/account/activating_deactivating_users.md)** - **[Deactivated](activating_deactivating_users.md)**
- **Without projects** - **Without projects**
For each user, their username, email address, are listed, also the date their account was For each user, their username, email address, are listed, also the date their account was
......
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