summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-12 15:13:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-12 15:13:54 +0000
commit462b603802e45891ac5152aea8cbc9298d7d4a53 (patch)
treede7e03460744491c0d7dcc6e3340272f833fb3b7 /app/helpers
parentda646aac6c559584f63d1fc06132d7351abcfac6 (diff)
downloadgitlab-ce-462b603802e45891ac5152aea8cbc9298d7d4a53.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/ssh_keys_helper.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/helpers/ssh_keys_helper.rb b/app/helpers/ssh_keys_helper.rb
index f5a9bea482b..17a9fd6146d 100644
--- a/app/helpers/ssh_keys_helper.rb
+++ b/app/helpers/ssh_keys_helper.rb
@@ -18,4 +18,14 @@ module SshKeysHelper
container: 'body'
}
end
+
+ def ssh_key_allowed_algorithms
+ allowed_algorithms = Gitlab::CurrentSettings.allowed_key_types.flat_map do |ssh_key_type_name|
+ Gitlab::SSHPublicKey.supported_algorithms_for_name(ssh_key_type_name)
+ end
+
+ quoted_allowed_algorithms = allowed_algorithms.map { |name| "'#{name}'" }
+
+ Gitlab::Utils.to_exclusive_sentence(quoted_allowed_algorithms)
+ end
end