diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 03:06:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 03:06:29 +0300 |
| commit | dffeff5520e861dc6e7319b690c573186bbbd22e (patch) | |
| tree | 21d4bba46452458b2854bcdd0b7de72622aa1bd8 /doc | |
| parent | d5e0416021aa6de53b89f9d415f368226d9326e5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/users.md | 2 | ||||
| -rw-r--r-- | doc/user/profile/account/delete_account.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 33b6efa7a02..f95ad7b62ba 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -1172,7 +1172,7 @@ Returns: - `404 User Not Found` if user cannot be found. - `403 Forbidden` when trying to deactivate a user: - Blocked by admin or by LDAP synchronization. - - That has any activity in past 14 days. These cannot be deactivated. + - That has any activity in past 180 days. These users cannot be deactivated. ## Activate user diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md index 65896bd19cd..be761ca7558 100644 --- a/doc/user/profile/account/delete_account.md +++ b/doc/user/profile/account/delete_account.md @@ -71,7 +71,7 @@ To do this: Please note that for the deactivation option to be visible to an admin, the user: - Must be currently active. -- Should not have any activity in the last 14 days. +- Should not have any activity in the last 180 days. ### Activating a user |