Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
defdfe72
Commit
defdfe72
authored
Sep 14, 2021
by
Evan Read
Committed by
Russell Dickenson
Sep 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow up to deactivation email content
parent
54761d33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
doc/user/admin_area/moderate_users.md
doc/user/admin_area/moderate_users.md
+5
-4
doc/user/admin_area/settings/email.md
doc/user/admin_area/settings/email.md
+4
-4
No files found.
doc/user/admin_area/moderate_users.md
View file @
defdfe72
...
@@ -137,6 +137,10 @@ A deactivated user:
...
@@ -137,6 +137,10 @@ A deactivated user:
Personal projects, and group and user history of the deactivated user are left intact.
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:
A user can be deactivated from the Admin Area. To do this:
1.
On the top bar, select
**Menu > Admin**
.
1.
On the top bar, select
**Menu > Admin**
.
...
@@ -145,7 +149,7 @@ A user can be deactivated from the Admin Area. To do this:
...
@@ -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 the
**{settings}**
**User administration**
dropdown.
1.
Select
**Deactivate**
.
1.
Select
**Deactivate**
.
For the deactivation option to be visible to an admin, the user:
For the deactivation option to be visible to an admin
istrator
, the user:
-
Must be currently active.
-
Must be currently active.
-
Must not have signed in, or have any activity, in the last 90 days.
-
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:
...
@@ -153,9 +157,6 @@ For the deactivation option to be visible to an admin, the user:
NOTE:
NOTE:
Users can also be deactivated using the
[
GitLab API
](
../../api/users.md#deactivate-user
)
.
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
### Automatically deactivate dormant users
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320875) in GitLab 14.0.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320875) in GitLab 14.0.
...
...
doc/user/admin_area/settings/email.md
View file @
defdfe72
...
@@ -72,16 +72,16 @@ To add additional text to emails:
...
@@ -72,16 +72,16 @@ To add additional text to emails:
1.
Enter your text in the
**Additional text**
field.
1.
Enter your text in the
**Additional text**
field.
1.
Select
**Save changes**
.
1.
Select
**Save changes**
.
##
Enable u
ser deactivation emails **(FREE SELF)**
##
U
ser 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
en
able these notifications:
To
dis
able these notifications:
1.
On the top bar, select
**Menu > Admin**
.
1.
On the top bar, select
**Menu > Admin**
.
1.
On the left sidebar, select
**Settings > Preferences**
(
`/admin/application_settings/preferences`
).
1.
On the left sidebar, select
**Settings > Preferences**
(
`/admin/application_settings/preferences`
).
1.
Expand
**Email**
.
1.
Expand
**Email**
.
1.
Select
**Enable user deactivation emails**
.
1.
Clear the
**Enable user deactivation emails**
checkbox
.
1.
Select
**Save changes**
.
1.
Select
**Save changes**
.
<!-- ## Troubleshooting
<!-- ## Troubleshooting
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment