Commit d7225fb0 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch '201769-change-deactivate-users-to-90-days' into 'master'

Resolve "Allow self-managed to deactivate users after 90 days"

Closes #201769

See merge request gitlab-org/gitlab!42989
parents ab684bbf 0b066913
...@@ -69,7 +69,7 @@ class User < ApplicationRecord ...@@ -69,7 +69,7 @@ class User < ApplicationRecord
LOGIN_FORBIDDEN = "Your account does not have the required permission to login. Please contact your GitLab " \ LOGIN_FORBIDDEN = "Your account does not have the required permission to login. Please contact your GitLab " \
"administrator if you think this is an error." "administrator if you think this is an error."
MINIMUM_INACTIVE_DAYS = 180 MINIMUM_INACTIVE_DAYS = 90
# Override Devise::Models::Trackable#update_tracked_fields! # Override Devise::Models::Trackable#update_tracked_fields!
# to limit database writes to at most once every hour # to limit database writes to at most once every hour
......
---
title: Adjusted deactivation threshold from 180 to 90 days
merge_request: 42989
author:
type: changed
...@@ -39,7 +39,7 @@ A user can be deactivated from the Admin Area. To do this: ...@@ -39,7 +39,7 @@ A user can be deactivated from the Admin Area. To do this:
Please note that for the deactivation option to be visible to an admin, the user: Please note that for the deactivation option to be visible to an admin, the user:
- Must be currently active. - Must be currently active.
- Must not have signed in, or have any activity, in the last 180 days. - 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). Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
......
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