Commit 3cd95700 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'storage-dropdown' into 'master'

Show gitaly address instead of disk path

See merge request gitlab-org/gitlab-ce!17954
parents f56ef206 0189ee97
...@@ -96,7 +96,7 @@ module ApplicationSettingsHelper ...@@ -96,7 +96,7 @@ module ApplicationSettingsHelper
def repository_storages_options_for_select(selected) def repository_storages_options_for_select(selected)
options = Gitlab.config.repositories.storages.map do |name, storage| options = Gitlab.config.repositories.storages.map do |name, storage|
["#{name} - #{storage.legacy_disk_path}", name] ["#{name} - #{storage['gitaly_address']}", name]
end end
options_for_select(options, selected) options_for_select(options, selected)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment