Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-03-14 16:42:49 +0300
committerJacob Vosmaer <jacob@gitlab.com>2018-03-21 20:18:32 +0300
commit008a6a6ce6fa943adcfecf3a606b845cfa282680 (patch)
treef98536d22e41415cb93a3e729ff49519cd37a13a /app
parentb3daf108aacc4ae363283d46395fe853fa06cccb (diff)
Route path lookups through legacy_disk_path
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_settings_helper.rb2
-rw-r--r--app/models/project.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 4c4d7cca8a5..f44f5165c03 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -96,7 +96,7 @@ module ApplicationSettingsHelper
def repository_storages_options_for_select(selected)
options = Gitlab.config.repositories.storages.map do |name, storage|
- ["#{name} - #{storage['path']}", name]
+ ["#{name} - #{storage.legacy_disk_path}", name]
end
options_for_select(options, selected)
diff --git a/app/models/project.rb b/app/models/project.rb
index 5f9d9785d64..f60660d00a4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -498,7 +498,7 @@ class Project < ActiveRecord::Base
end
def repository_storage_path
- Gitlab.config.repositories.storages[repository_storage].try(:[], 'path')
+ Gitlab.config.repositories.storages[repository_storage]&.legacy_disk_path
end
def team