diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-06-27 19:20:03 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-27 19:20:03 +0300 |
| commit | 1142e2c32eb0c4f4040c13d40d73fb8f84f35628 (patch) | |
| tree | 512a0ed100c24e1376c6457e248b1922e4a3f359 /config/initializers/1_settings.rb | |
| parent | 4f7dce769559f0fca2448e25417e5fef2b51df06 (diff) | |
Migrate storage nesting check to Gitaly
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 3d3448cb4d6..837e577bc91 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -394,7 +394,7 @@ repositories_storages = Settings.repositories.storages.values repository_downloads_path = Settings.gitlab['repository_downloads_path'].to_s.gsub(%r{/$}, '') repository_downloads_full_path = File.expand_path(repository_downloads_path, Settings.gitlab['user_home']) -# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1237 +# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1255 Gitlab::GitalyClient::StorageSettings.allow_disk_access do if repository_downloads_path.blank? || repositories_storages.any? { |rs| [repository_downloads_path, repository_downloads_full_path].include?(rs.legacy_disk_path.gsub(%r{/$}, '')) } Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive') |