diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-09-03 11:49:16 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-09-03 11:49:16 +0300 |
| commit | b5be01bc1fb3dc075eb7a73ef55098ecd5515234 (patch) | |
| tree | e6572327b2116e88a026df54b75abbb0f86c5445 /config | |
| parent | 61ffa04d28ba5d8c522658c5c640009dd7991ec5 (diff) | |
| parent | 19e56902cac9a653b0255e88faaced0e0e8ff703 (diff) | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 9ad55e21d11..ab351b86cae 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -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? |