diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-01-31 17:53:09 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-01-31 17:55:44 +0000 |
| commit | 27863b10d110e38b0ae7bfd1fefc0cc32646b748 (patch) | |
| tree | 88b88e7909d302902b39c926c0f098a21c78dbb8 | |
| parent | 08e013431acb5238b4806260c4b9c304837097a3 (diff) | |
| download | gitlab-ce-27863b10d110e38b0ae7bfd1fefc0cc32646b748.tar.gz | |
Refactor repository_storages_options_for_select
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 8ef561d90e6..e91e1d29d64 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -96,12 +96,12 @@ module ApplicationSettingsHelper ] end - def repository_storages_options_for_select + def repository_storages_options_for_select(selected) options = Gitlab.config.repositories.storages.map do |name, storage| ["#{name} - #{storage['path']}", name] end - options_for_select(options, @application_setting.repository_storages) + options_for_select(options, selected) end def sidekiq_queue_options_for_select diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index ba4ca88a8a9..fb5e6f337a7 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -537,7 +537,8 @@ .form-group = f.label :repository_storages, 'Storage paths for new projects', class: 'control-label col-sm-2' .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 Manage repository storage paths. Learn more in the = succeed "." do |