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
0b066913
Commit
0b066913
authored
Sep 29, 2020
by
Kevin Chasse
Committed by
Bob Van Landuyt
Sep 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Allow self-managed to deactivate users after 90 days"
parent
f530f59c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/models/user.rb
app/models/user.rb
+1
-1
changelogs/unreleased/42989-update-deactivation-threshold-to-90-days.yml
...leased/42989-update-deactivation-threshold-to-90-days.yml
+5
-0
doc/user/admin_area/activating_deactivating_users.md
doc/user/admin_area/activating_deactivating_users.md
+1
-1
No files found.
app/models/user.rb
View file @
0b066913
...
...
@@ -69,7 +69,7 @@ class User < ApplicationRecord
LOGIN_FORBIDDEN
=
"Your account does not have the required permission to login. Please contact your GitLab "
\
"administrator if you think this is an error."
MINIMUM_INACTIVE_DAYS
=
18
0
MINIMUM_INACTIVE_DAYS
=
9
0
# Override Devise::Models::Trackable#update_tracked_fields!
# to limit database writes to at most once every hour
...
...
changelogs/unreleased/42989-update-deactivation-threshold-to-90-days.yml
0 → 100644
View file @
0b066913
---
title
:
Adjusted deactivation threshold from 180 to 90 days
merge_request
:
42989
author
:
type
:
changed
doc/user/admin_area/activating_deactivating_users.md
View file @
0b066913
...
...
@@ -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:
-
Must be currently active.
-
Must not have signed in, or have any activity, in the last
18
0 days.
-
Must not have signed in, or have any activity, in the last
9
0 days.
Users can also be deactivated using the
[
GitLab API
](
../../api/users.md#deactivate-user
)
.
...
...
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