Merge branch 'storage-dropdown' into 'master'

Show gitaly address instead of disk path

See merge request gitlab-org/gitlab-ce!17954

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)