Merge branch 'bvl-transient-failure-health-controller-spec' into 'master'

Don't memoize storage configuration on `FsShardsCheck`

Closes #38140

See merge request gitlab-org/gitlab-ce!14419
This commit is contained in:
Douwe Maan 2017-09-21 17:33:09 +00:00
commit b3544dfe11
1 changed files with 2 additions and 2 deletions

View File

@ -58,11 +58,11 @@ module Gitlab
end
def repository_storages
@repository_storage ||= storages_paths.keys
storages_paths.keys
end
def storages_paths
@storage_paths ||= Gitlab.config.repositories.storages
Gitlab.config.repositories.storages
end
def exec_with_timeout(cmd_args, *args, &block)