Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 77 insertions, 36 deletions

diff --git a/doc/user/admin_area/moderate_users.md b/doc/user/admin_area/moderate_users.md
index 3889dd93d59..8211167895c 100644
--- a/doc/user/admin_area/moderate_users.md
+++ b/doc/user/admin_area/moderate_users.md
@@ -7,13 +7,66 @@ type: howto
 
 # Moderate users
 
-GitLab administrators can moderate user access by blocking, banning, or deactivating users.
+GitLab administrators can moderate user access by approving, blocking, banning, or deactivating
+users.
 
-## Blocking and unblocking users
+## Users pending approval
+
+A user in _pending approval_ state requires action by an administrator. A user sign up can be in a
+pending approval state because an administrator has enabled either, or both, of the following
+options:
+
+- [Require admin approval for new sign-ups](settings/sign_up_restrictions.md#require-administrator-approval-for-new-sign-ups) setting.
+- [User cap](settings/sign_up_restrictions.md#user-cap).
+
+When a user registers for an account while this setting is enabled:
+
+- The user is placed in a **Pending approval** state.
+- The user sees a message telling them their account is awaiting approval by an administrator.
+
+A user pending approval:
+
+- Is functionally identical to a [blocked](#block-a-user) user.
+- Cannot sign in.
+- Cannot access Git repositories or the GitLab API.
+- Does not receive any notifications from GitLab.
+- Does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
+
+An administrator must [approve their sign up](#approve-or-reject-a-user-sign-up) to allow them to
+sign in.
+
+### View user sign ups pending approval
+
+To view user sign ups pending approval:
+
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Overview > Users**.
+1. Select the **Pending approval** tab.
+
+### Approve or reject a user sign up
+
+A user sign up pending approval can be approved or rejected from the Admin Area.
+
+To approve or reject a user sign up:
+
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Overview > Users**.
+1. Select the **Pending approval** tab.
+1. (Optional) Select a user.
+1. Select the **{settings}** **User administration** dropdown.
+1. Select **Approve** or **Reject**.
+
+Approving a user:
+
+- Activates their account.
+- Changes the user's state to active.
+- Consumes a subscription [seat](../../subscriptions/self_managed/index.md#billable-users).
+
+## Block and unblock users
 
 GitLab administrators can block and unblock users.
 
-### Blocking a user
+### Block a user
 
 In order to completely prevent access of a user to the GitLab instance,
 administrators can choose to block the user.
@@ -33,15 +86,14 @@ A blocked user:
 - Cannot access Git repositories or the API.
 - Does not receive any notifications from GitLab.
 - Cannot use [slash commands](../../integration/slash_commands.md).
+- Does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
 
 Personal projects, and group and user history of the blocked user are left intact.
 
-Users can also be blocked using the [GitLab API](../../api/users.md#block-user).
-
 NOTE:
-A blocked user does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
+Users can also be blocked using the [GitLab API](../../api/users.md#block-user).
 
-### Unblocking a user
+### Unblock a user
 
 A blocked user can be unblocked from the Admin Area. To do this:
 
@@ -52,24 +104,24 @@ A blocked user can be unblocked from the Admin Area. To do this:
 1. Select the **{settings}** **User administration** dropdown.
 1. Select **Unblock**.
 
-Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-user).
+The user's state is set to active and they consume a
+[seat](../../subscriptions/self_managed/index.md#billable-users).
 
 NOTE:
-Unblocking a user changes the user's state to active and consumes a
-[seat](../../subscriptions/self_managed/index.md#billable-users).
+Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-user).
 
-## Activating and deactivating users
+## Activate and deactivate users
 
 GitLab administrators can deactivate and activate users.
 
-### Deactivating a user
+### Deactivate a user
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22257) 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.
 
-Deactivating a user is functionally identical to [blocking a user](#blocking-and-unblocking-users),
+Deactivating a user is functionally identical to [blocking a user](#block-and-unblock-users),
 with the following differences:
 
 - It does not prohibit the user from logging back in via the UI.
@@ -80,6 +132,7 @@ A deactivated user:
 - Cannot access Git repositories or the API.
 - Does not receive any notifications from GitLab.
 - Does not be able to use [slash commands](../../integration/slash_commands.md).
+- Does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
 
 Personal projects, and group and user history of the deactivated user are left intact.
 
@@ -91,15 +144,13 @@ A user can be deactivated from the Admin Area. To do this:
 1. Select the **{settings}** **User administration** dropdown.
 1. Select **Deactivate**.
 
-Please note that for the deactivation option to be visible to an admin, the user:
+For the deactivation option to be visible to an admin, the user:
 
 - Must be currently active.
 - Must not have signed in, or have any activity, in the last 90 days.
 
-Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
-
 NOTE:
-A deactivated user does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
+Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
 
 ### Automatically deactivate dormant users
 
@@ -118,7 +169,7 @@ When this feature is enabled, GitLab runs a job once a day to deactivate the dor
 
 A maximum of 100,000 users can be deactivated per day.
 
-### Activating a user
+### Activate a user
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22257) in GitLab 12.4.
 
@@ -133,29 +184,23 @@ To do this:
 1. Select the **{settings}** **User administration** dropdown.
 1. Select **Activate**.
 
-Users can also be activated using the [GitLab API](../../api/users.md#activate-user).
-
-NOTE:
-Activating a user changes the user's state to active and consumes a
+The user's state is set to active and they consume a
 [seat](../../subscriptions/self_managed/index.md#billable-users).
 
 NOTE:
 A deactivated user can also activate their account themselves by logging back in via the UI.
+Users can also be activated using the [GitLab API](../../api/users.md#activate-user).
 
 ## Ban and unban users
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327353) in GitLab 13.12.
-
-GitLab administrators can ban users.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327353) in GitLab 14.2.
 
-NOTE:
-This feature is behind a feature flag that is disabled by default. GitLab administrators
-with access to the GitLab Rails console can [enable](../../administration/feature_flags.md)
-this feature for your GitLab instance.
+GitLab administrators can ban and unban users. Banned users are blocked, and their issues are hidden. 
+The banned user's comments are still displayed. Hiding a banned user's comments is [tracked in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/327356).
 
 ### Ban a user
 
-To completely block a user, administrators can choose to ban the user.
+To block a user and hide their contributions, administrators can ban the user.
 
 Users can be banned using the Admin Area. To do this:
 
@@ -165,10 +210,7 @@ Users can be banned using the Admin Area. To do this:
 1. Select the **{settings}** **User administration** dropdown.
 1. Select **Ban user**.
 
-NOTE:
-This feature is a work in progress. Currently, banning a user
-only blocks them and does not hide their comments or issues.
-This functionality is planned to be implemented in follow up issues.
+The banned user does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
 
 ### Unban a user
 
@@ -181,6 +223,5 @@ A banned user can be unbanned using the Admin Area. To do this:
 1. Select the **{settings}** **User administration** dropdown.
 1. Select **Unban user**.
 
-NOTE:
-Unbanning a user changes the user's state to active and consumes a
+The user's state is set to active and they consume a
 [seat](../../subscriptions/self_managed/index.md#billable-users).