summaryrefslogtreecommitdiff
path: root/app/helpers/application_settings_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 18:09:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 18:09:21 +0000
commit43e3dc2f95a25c600e08f65d4f1c406a1a63ed3d (patch)
treedb5c72020c7c8916020c8aff7c1b7128028d650b /app/helpers/application_settings_helper.rb
parent2c89e169769ead722394a79ed67fcd08e96863dd (diff)
downloadgitlab-ce-43e3dc2f95a25c600e08f65d4f1c406a1a63ed3d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
-rw-r--r--app/helpers/application_settings_helper.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 3d2304ed42b..f96c26b428c 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -119,6 +119,17 @@ module ApplicationSettingsHelper
options_for_select(options, selected)
end
+ def repository_storages_options_json
+ options = Gitlab.config.repositories.storages.map do |name, storage|
+ {
+ label: "#{name} - #{storage['gitaly_address']}",
+ value: name
+ }
+ end
+
+ options.to_json
+ end
+
def external_authorization_description
_("If enabled, access to projects will be validated on an external service"\
" using their classification label.")