diff options
| author | Paul Charlton <techguru@byiq.com> | 2017-07-11 14:23:51 +0800 |
|---|---|---|
| committer | Paul Charlton <techguru@byiq.com> | 2017-07-11 14:23:51 +0800 |
| commit | 65eca13f7b6a93b54267f82e4c66a5f9bab69dc1 (patch) | |
| tree | 109f3170ff776407d5e947c2e8ebc317c62833fb /lib | |
| parent | 0b434daf52cb93ea42cb49ce15aa59dd01599181 (diff) | |
| download | gitlab-ce-65eca13f7b6a93b54267f82e4c66a5f9bab69dc1.tar.gz | |
Repair Regression caused by - !11573
some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573.
This commit serves to reapply those changes.
/cc: @rspeicher @stanhu @mikegreiling
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 791a3c36476..7fa02f3d7b3 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -25,7 +25,7 @@ module Gitlab def cached_application_settings begin ::ApplicationSetting.cached - rescue ::Redis::BaseError, ::Errno::ENOENT + rescue ::Redis::BaseError, ::Errno::ENOENT, ::Errno::EADDRNOTAVAIL # In case Redis isn't running or the Redis UNIX socket file is not available end end |