kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sh-bump-unauth-expiration' into 'master' 

Bump unauthenticated session time from 1 hour to 2 hours

Closes #50393

See merge request gitlab-org/gitlab-ce!21453
This commit is contained in:
Douwe Maan 2018-09-03 08:49:16 +00:00
parent 61ffa04d28 19e56902ca
commit b5be01bc1f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/sh-bump-unauth-expiration.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Bump unauthenticated session time from 1 hour to 2 hours
merge_request: 21453
author:
type: other

2
config/initializers/1_settings.rb
View File

@ -141,7 +141,7 @@ Settings.gitlab['default_projects_features'] ||= {}
Settings.gitlab['webhook_timeout'] ||= 10
Settings.gitlab['max_attachment_size'] ||= 10
Settings.gitlab['session_expire_delay'] ||= 10080
Settings.gitlab['unauthenticated_session_expire_delay'] ||= 1.hour.to_i
Settings.gitlab['unauthenticated_session_expire_delay'] ||= 2.hours.to_i
Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil?
Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
Settings.gitlab.default_projects_features['wiki'] = true if Settings.gitlab.default_projects_features['wiki'].nil?