Merge branch 'master' into update-todo-in-uiupdate-todo-in-ui

* master: (435 commits)
  Change occurrence of Sidekiq::Testing.inline!
  Fix order-dependent spec failure in appearance_spec.rb
  Put a failed example from appearance_spec in quarantine
  Cache PerformanceBar.allowed_user_ids list locally and in Redis
  Add Grafana to Admin > Monitoring menu when enabled
  Add changelog entry
  Add salesforce logo
  Move error_tracking_frontend specs to Jest
  Only save Peek session in Redis when Peek is enabled
  Migrate markdown header_spec.js to Jest
  Fix golint command in Go guide doc to be recursive
  Move images to their own dirs
  Gitlab -> GitLab
  Re-align CE and EE API docs
  Rename Release groups in issue_workflow.md
  Update api docs to finish aligning EE and CE docs
  Update locale.pot
  Update TODO: allow_collaboration column renaming
  Show upcoming status for releases
  Rebased and squashed commits
  ...

1 files changed, 6 insertions, 15 deletions

diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb
index bf9e5a50382..827b15e5c8d 100644
--- a/config/initializers/6_validations.rb
+++ b/config/initializers/6_validations.rb
@@ -1,24 +1,15 @@
-def storage_name_valid?(name)
-  !!(name =~ /\A[a-zA-Z0-9\-_]+\z/)
-end
-
 def storage_validation_error(message)
   raise "#{message}. Please fix this in your gitlab.yml before starting GitLab."
 end
 
 def validate_storages_config
-  storage_validation_error('No repository storage path defined') if Gitlab.config.repositories.storages.empty?
-
-  Gitlab.config.repositories.storages.each do |name, repository_storage|
-    storage_validation_error("\"#{name}\" is not a valid storage name") unless storage_name_valid?(name)
-
-    %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?
+  if Gitlab.config.repositories.storages.empty?
+    storage_validation_error('No repository storage path defined')
+  end
 
-      unless repository_storage[setting].to_f > 0
-        storage_validation_error("`#{setting}` for storage `#{name}` needs to be greater than 0")
-      end
+  Gitlab.config.repositories.storages.keys.each do |name|
+    unless /\A[a-zA-Z0-9\-_]+\z/.match?(name)
+      storage_validation_error("\"#{name}\" is not a valid storage name")
     end
   end
 end