diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-11 11:19:30 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-11 11:19:30 +0300 |
| commit | a99e8a75923cb729b22d83530c696ca7063c732d (patch) | |
| tree | 3c770ab9c47278f8f1085c73a4bc8f9820b0dd5e /config | |
| parent | f91aaccf4d0c182c01046ba38cbd9ed30b9d3684 (diff) | |
| parent | b788863c68307cc3f17e5cde92b610821c12816a (diff) | |
Merge branch 'zj-validation-initializer' into 'master'
Remove method call to deprecated method
See merge request gitlab-org/gitlab-ce!18815
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/6_validations.rb | 11 |
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? |