diff options
| author | themaze75 <maze@novisoft.com> | 2015-06-05 17:16:32 +0000 |
|---|---|---|
| committer | Eric Maziade <eric@maziade.com> | 2015-06-10 22:10:00 -0400 |
| commit | 1d080f57454fda46eb60700a8693cb968e6d557f (patch) | |
| tree | f94ed33eccf48632ee52f9095ff7745b56c47cb3 /config/initializers/1_settings.rb | |
| parent | 84a414fe534ebb60c8e7396c245486be521e2a11 (diff) | |
| download | gitlab-ce-1d080f57454fda46eb60700a8693cb968e6d557f.tar.gz | |
session_expire_seconds => session_expire_delay
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
Diffstat (limited to 'config/initializers/1_settings.rb')
| -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 9b39dff046e..f050a7ea1a5 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -128,7 +128,7 @@ Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab['webhook_timeout'] ||= 10 Settings.gitlab['max_attachment_size'] ||= 10 -Settings.gitlab['session_expire_seconds'] ||= 604800 +Settings.gitlab['session_expire_delay'] ||= 10080 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? |