diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-29 14:28:41 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-29 14:28:41 -0700 |
| commit | d10642a4b86d91faf7a3ffa508b4e8067213b14c (patch) | |
| tree | 4b094a4d86a66c2f7a6ad03ef9f1eb7a896915ef /lib | |
| parent | c600cf83488398cf66b10af85ed9490fe9457bd4 (diff) | |
| download | gitlab-ce-d10642a4b86d91faf7a3ffa508b4e8067213b14c.tar.gz | |
Handle case when Redis cache returns an empty setting
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 67d6be3515d..54b46e5d23f 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -11,7 +11,7 @@ module Gitlab def ensure_application_settings! if connect_to_db? begin - settings = ::ApplicationSetting.cached + settings = ::ApplicationSetting.current # In case Redis isn't running or the Redis UNIX socket file is not available rescue ::Redis::BaseError, ::Errno::ENOENT settings = ::ApplicationSetting.last |