summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-07-19 18:23:27 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-07-19 18:23:27 +0000
commiteb3f465e75ee1fc5ef582e9f01f921626d7cf5cc (patch)
tree878c43ecb6dc5fbf11baf252e0e7b00bc34f6f65 /lib/gitlab
parentfbfba6f1b433512b91c6244746ff064f2d790e3f (diff)
parentec5ceae623fceff0a959c7d297970d37285532dc (diff)
downloadgitlab-ce-eb3f465e75ee1fc5ef582e9f01f921626d7cf5cc.tar.gz
Merge branch 'sh-fix-gitaly-server-info-cache' into 'master'
Fix Gitaly auto-detection caching Closes #64802 See merge request gitlab-org/gitlab-ce!30954
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/gitaly_client.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index e7319a7b7f0..c98de722fe1 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -392,7 +392,7 @@ module Gitlab
@can_use_disk[storage]
end
- return cached_value if cached_value.present?
+ return cached_value unless cached_value.nil?
gitaly_filesystem_id = filesystem_id(storage)
direct_filesystem_id = filesystem_id_from_disk(storage)