summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-23 13:03:51 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-23 13:03:51 +0000
commit3cd95700d4ba4aa48c1d551e6982e9390594a1de (patch)
tree5834640d0c04a8d6de3840f1673f5905709bca83
parentf56ef2065710346f9998c87a136abc2fe3cbc454 (diff)
parent0189ee979ca6b17f6fafbffb53b0c1608f1adae3 (diff)
downloadgitlab-ce-3cd95700d4ba4aa48c1d551e6982e9390594a1de.tar.gz
Merge branch 'storage-dropdown' into 'master'
Show gitaly address instead of disk path See merge request gitlab-org/gitlab-ce!17954
-rw-r--r--app/helpers/application_settings_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index c8dfa140529..b3b080e6dcf 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.legacy_disk_path}", name]
+ ["#{name} - #{storage['gitaly_address']}", name]
end
options_for_select(options, selected)