summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2016-11-03 14:12:20 +0000
committerNick Thomas <nick@gitlab.com>2016-11-04 04:01:08 +0000
commitc1388d0efb79b755c06b9db19fc4ad47af7cf0a3 (patch)
tree4f1bbfca15dc287d2b14a68f4e5167c18f5a1b10 /app/helpers
parent3a8a7c1251cef4098ffbc54718ba21736c5e2800 (diff)
downloadgitlab-ce-c1388d0efb79b755c06b9db19fc4ad47af7cf0a3.tar.gz
Allow multiple repository storage shards to be enabled, and automatically round-robin between them
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_settings_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 6229384817b..45a567a1eba 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -93,11 +93,11 @@ module ApplicationSettingsHelper
end
end
- def repository_storage_options_for_select
+ def repository_storages_options_for_select
options = Gitlab.config.repositories.storages.map do |name, path|
["#{name} - #{path}", name]
end
- options_for_select(options, @application_setting.repository_storage)
+ options_for_select(options, @application_setting.repository_storages)
end
end