summaryrefslogtreecommitdiff
path: root/config/initializers/6_validations.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-05-08 13:13:56 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-05-11 08:57:06 +0200
commitb788863c68307cc3f17e5cde92b610821c12816a (patch)
tree27819e5ee9a34f80933d47387edc16b6010180c4 /config/initializers/6_validations.rb
parent3d93ad103b32b71d4af330c17227c23a2a167bae (diff)
downloadgitlab-ce-b788863c68307cc3f17e5cde92b610821c12816a.tar.gz
Remove method call to deprecated method
Given the settings initializer creates Gitaly Storage Settings objects already, the calls to path can be moved to that initializer.
Diffstat (limited to 'config/initializers/6_validations.rb')
-rw-r--r--config/initializers/6_validations.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb
index d92cdb97766..89aabe530fe 100644
--- a/config/initializers/6_validations.rb
+++ b/config/initializers/6_validations.rb
@@ -26,17 +26,6 @@ def validate_storages_config
Gitlab.config.repositories.storages.each do |name, repository_storage|
storage_validation_error("\"#{name}\" is not a valid storage name") unless storage_name_valid?(name)
- if repository_storage.is_a?(String)
- raise "#{name} is not a valid storage, because it has no `path` key. " \
- "It may be configured as:\n\n#{name}:\n path: #{repository_storage}\n\n" \
- "For source installations, update your config/gitlab.yml Refer to gitlab.yml.example for an updated example.\n\n" \
- "If you're using the Gitlab Development Kit, you can update your configuration running `gdk reconfigure`.\n"
- end
-
- if !repository_storage.is_a?(Gitlab::GitalyClient::StorageSettings) || repository_storage.legacy_disk_path.nil?
- 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_reset_time storage_timeout).each do |setting|
# Falling back to the defaults is fine!
next if repository_storage[setting].nil?