Commit 71848f70 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'

Backport changes in the application settings helper to CE

See merge request gitlab-org/gitlab-ce!16801
parents cf644fc1 27863b10
...@@ -96,12 +96,12 @@ module ApplicationSettingsHelper ...@@ -96,12 +96,12 @@ module ApplicationSettingsHelper
] ]
end end
def repository_storages_options_for_select 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['path']}", name] ["#{name} - #{storage['path']}", name]
end end
options_for_select(options, @application_setting.repository_storages) options_for_select(options, selected)
end end
def sidekiq_queue_options_for_select def sidekiq_queue_options_for_select
......
...@@ -537,7 +537,8 @@ ...@@ -537,7 +537,8 @@
.form-group .form-group
= f.label :repository_storages, 'Storage paths for new projects', class: 'control-label col-sm-2' = f.label :repository_storages, 'Storage paths for new projects', class: 'control-label col-sm-2'
.col-sm-10 .col-sm-10
= f.select :repository_storages, repository_storages_options_for_select, {include_hidden: false}, multiple: true, class: 'form-control' = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
{include_hidden: false}, multiple: true, class: 'form-control'
.help-block .help-block
Manage repository storage paths. Learn more in the Manage repository storage paths. Learn more in the
= succeed "." do = succeed "." do
......
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