diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-25 16:55:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-25 16:55:21 +0300 |
| commit | 6587d3680e2c1f47c080636bdbbda59bdc8ba4d8 (patch) | |
| tree | 6a8b00f4be97bd9fb13d96b98a7e073adca8c8eb /app/helpers | |
| parent | 5beb4ddebfa23b288dc088c7175c2456d411f4f1 (diff) | |
| parent | ec4423665cacfe2f0675fb8b9b5bd8dd17a77dd7 (diff) | |
Merge branch 'zj-storage-path-deprecation' into 'master'
Legacy disk path refactor
Closes gitaly#1111
See merge request gitlab-org/gitlab-ce!18364
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a64b2acdd77..801e624e1de 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -400,7 +400,8 @@ module ProjectsHelper exports_path = File.join(Settings.shared['path'], 'tmp/project_exports') filtered_message = message.strip.gsub(exports_path, "[REPO EXPORT PATH]") - filtered_message.gsub(project.repository_storage_path.chomp('/'), "[REPOS PATH]") + disk_path = Gitlab.config.repositories.storages[project.repository_storage].legacy_disk_path + filtered_message.gsub(disk_path.chomp('/'), "[REPOS PATH]") end def project_child_container_class(view_path) |