diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-18 21:35:24 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-18 21:35:24 -0700 |
| commit | 930ca2d599802ae0983770311b641080f23f056d (patch) | |
| tree | e6793d1b859747f1f26899067e92a6c94ebf16a9 /config | |
| parent | a6dfed3a587feb45a793911f3d750665be92b315 (diff) | |
| parent | 98eccfc44c597ba14939659ca3b9150197129961 (diff) | |
| download | gitlab-ce-930ca2d599802ae0983770311b641080f23f056d.tar.gz | |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 4b9cc59ec45..44bc72a7185 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -140,6 +140,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.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? |