Commit 4844306c authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'eread/followup-to-deactivation-email-content' into 'master'

Follow up to deactivation email content

See merge request gitlab-org/gitlab!70139
parents eabf5eba defdfe72
......@@ -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.
......
......@@ -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**.
<!-- ## Troubleshooting
......
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