diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-16 16:38:00 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-16 16:38:00 +0300 |
commit | 4e0ee10a721d73c7169a0dded4a38ba850459b70 (patch) | |
tree | b800119b35a955ade21c0d57d2bed0d7cad9e86e /config/initializers | |
parent | 853799923d000c0386e6895bb91ed05e2886e068 (diff) | |
parent | 93d56eb2a5763cb5f1ac89610bb2e1dc7f77a04a (diff) |
Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'
Circuitbreaker settings to avoid spec-failures
Closes #36324
See merge request !13519
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/6_validations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb index 92ce4dd03cd..f8e67ce04c9 100644 --- a/config/initializers/6_validations.rb +++ b/config/initializers/6_validations.rb @@ -37,12 +37,12 @@ def validate_storages_config storage_validation_error("#{name} is not a valid storage, because it has no `path` key. Refer to gitlab.yml.example for an updated example") end - %w(failure_count_threshold failure_wait_time failure_reset_time storage_timeout).each do |setting| + %w(failure_count_threshold failure_reset_time storage_timeout).each do |setting| # Falling back to the defaults is fine! next if repository_storage[setting].nil? unless repository_storage[setting].to_f > 0 - storage_validation_error("#{setting}, for storage `#{name}` needs to be greater than 0") + storage_validation_error("`#{setting}` for storage `#{name}` needs to be greater than 0") end end end |