From 5628b1ec1507638b47fda279b2a70b526a36613f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Sep 2021 06:11:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/admin_area/moderate_users.md | 9 +++++---- doc/user/admin_area/settings/account_and_limit_settings.md | 4 ++-- doc/user/admin_area/settings/email.md | 8 ++++---- doc/user/application_security/sast/index.md | 3 +++ doc/user/group/index.md | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) (limited to 'doc/user') diff --git a/doc/user/admin_area/moderate_users.md b/doc/user/admin_area/moderate_users.md index a29dbde9379..2655d927b87 100644 --- a/doc/user/admin_area/moderate_users.md +++ b/doc/user/admin_area/moderate_users.md @@ -137,6 +137,10 @@ A deactivated user: Personal projects, and group and user history of the deactivated user are left intact. +NOTE: +Users are notified about account deactivation if +[user deactivation emails](settings/email.md#user-deactivation-emails) are enabled. + A user can be deactivated from the Admin Area. To do this: 1. On the top bar, select **Menu > Admin**. @@ -145,7 +149,7 @@ A user can be deactivated from the Admin Area. To do this: 1. Select the **{settings}** **User administration** dropdown. 1. Select **Deactivate**. -For the deactivation option to be visible to an admin, the user: +For the deactivation option to be visible to an administrator, the user: - Must be currently active. - Must not have signed in, or have any activity, in the last 90 days. @@ -153,9 +157,6 @@ For the deactivation option to be visible to an admin, the user: NOTE: Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user). -NOTE: -Users can be notified about account deactivation if [user deactivation emails](settings/email.md#enable-user-deactivation-emails) are enabled. - ### Automatically deactivate dormant users > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320875) in GitLab 14.0. diff --git a/doc/user/admin_area/settings/account_and_limit_settings.md b/doc/user/admin_area/settings/account_and_limit_settings.md index dd578f5dc9b..3549aa5323b 100644 --- a/doc/user/admin_area/settings/account_and_limit_settings.md +++ b/doc/user/admin_area/settings/account_and_limit_settings.md @@ -154,12 +154,12 @@ nginx['client_max_body_size'] = "200m" > - It's deployed behind a feature flag, disabled by default. > - It's disabled on GitLab.com. > - It's not recommended for production use. -> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](../../../security/two_factor_authentication.md#enable-or-disable-two-factor-authentication-2fa-for-git-operations). +> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](../../../security/two_factor_authentication.md#enable-or-disable-2fa-for-git-operations). NOTE: This feature is under development and not ready for production use. It is deployed behind a feature flag that is **disabled by default**. To use it in GitLab -self-managed instances, ask a GitLab administrator to [enable it](../../../security/two_factor_authentication.md#enable-or-disable-two-factor-authentication-2fa-for-git-operations). +self-managed instances, ask a GitLab administrator to [enable it](../../../security/two_factor_authentication.md#enable-or-disable-2fa-for-git-operations). GitLab administrators can choose to customize the session duration (in minutes) for Git operations when 2FA is enabled. The default is 15 and this can be set to a value between 1 and 10080. diff --git a/doc/user/admin_area/settings/email.md b/doc/user/admin_area/settings/email.md index ad4291cbe26..c04a9a12912 100644 --- a/doc/user/admin_area/settings/email.md +++ b/doc/user/admin_area/settings/email.md @@ -72,16 +72,16 @@ To add additional text to emails: 1. Enter your text in the **Additional text** field. 1. Select **Save changes**. -## Enable user deactivation emails **(FREE SELF)** +## User deactivation emails **(FREE SELF)** -GitLab can send email notifications to users when their account has been deactivated. +GitLab sends email notifications to users when their account has been deactivated. -To enable these notifications: +To disable these notifications: 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Preferences** (`/admin/application_settings/preferences`). 1. Expand **Email**. -1. Select **Enable user deactivation emails**. +1. Clear the **Enable user deactivation emails** checkbox. 1. Select **Save changes**.