diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-25 02:27:27 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-11-25 02:27:27 +0000 |
| commit | 5288fbe4eb70061e59db43efcd9c0d6d048a8670 (patch) | |
| tree | 41ea094fc5f74c7e6e51303b14d98c457bd4165a | |
| parent | 9a4ae859487b42c1e7ada365bf4d45c569145bb3 (diff) | |
| parent | 0985032132a2dfa02f2968a3e959df8629b77b12 (diff) | |
| download | gitlab-ce-5288fbe4eb70061e59db43efcd9c0d6d048a8670.tar.gz | |
Merge branch 'session_expire_delay_cannot_be_nil' into 'master'
Maybe rescue session_expire_delay by setting a default value.
Related to gitlab-org/omnibus-gitlab#956
See merge request !1880
| -rw-r--r-- | config/initializers/session_store.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index d7c5432da76..f30178ff711 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -3,10 +3,11 @@ require 'gitlab/current_settings' include Gitlab::CurrentSettings -# allow it to fail: it may to do so when create_from_defaults is executed before migrations are actually done +# allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done begin - Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay + Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay || 10080 rescue + Settings.gitlab['session_expire_delay'] ||= 10080 end unless Rails.env.test? |