summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-19 11:36:51 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-19 11:36:51 +0000
commit4c6c105909ea610eac760b05e66d9efc57cbb43c (patch)
tree9be9635992c645c8eeca061895f1642714a5549d /lib/gitlab
parent2973c1b2aab39e53ac0b033e03c21c85f1f0bd53 (diff)
parentb00aaeced7b5ab8926ae4633d4d8c3512d168589 (diff)
downloadgitlab-ce-4c6c105909ea610eac760b05e66d9efc57cbb43c.tar.gz
Merge branch '37999-fix-circuit-breaker' into 'master'
Fix the filesystem shard health check to check all configured shards Closes #37999 See merge request gitlab-org/gitlab-ce!14341
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/health_checks/fs_shards_check.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/health_checks/fs_shards_check.rb b/lib/gitlab/health_checks/fs_shards_check.rb
index eef97f54962..a533d4364ef 100644
--- a/lib/gitlab/health_checks/fs_shards_check.rb
+++ b/lib/gitlab/health_checks/fs_shards_check.rb
@@ -58,7 +58,7 @@ module Gitlab
end
def repository_storages
- @repository_storage ||= Gitlab::CurrentSettings.current_application_settings.repository_storages
+ @repository_storage ||= storages_paths.keys
end
def storages_paths