diff options
Diffstat (limited to 'lib/gitlab/setup_helper.rb')
| -rw-r--r-- | lib/gitlab/setup_helper.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb index 2b7e12639be..7f2d08b0916 100644 --- a/lib/gitlab/setup_helper.rb +++ b/lib/gitlab/setup_helper.rb @@ -11,8 +11,6 @@ module Gitlab # only generate a configuration for the most common and simplest case: when # we have exactly one Gitaly process and we are sure it is running locally # because it uses a Unix socket. - # For development and testing purposes, an extra storage is added to gitaly, - # which is not known to Rails, but must be explicitly stubbed. def gitaly_configuration_toml(gitaly_dir, storage_paths, gitaly_ruby: true) storages = [] address = nil @@ -31,13 +29,6 @@ module Gitlab storages << { name: key, path: storage_paths[key] } end - if Rails.env.test? - storage_path = Rails.root.join('tmp', 'tests', 'second_storage').to_s - - FileUtils.mkdir(storage_path) unless File.exist?(storage_path) - storages << { name: 'test_second_storage', path: storage_path } - end - config = { socket_path: address.sub(/\Aunix:/, ''), storage: storages } config[:auth] = { token: 'secret' } if Rails.env.test? config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby |