From 2b3bfe8fc59ed4cdc385955cdb38cbd481b45426 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Jan 2020 00:07:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/key.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'app/models/key.rb') diff --git a/app/models/key.rb b/app/models/key.rb index e549c59b58f..71188f210bb 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -142,13 +142,9 @@ class Key < ApplicationRecord end def forbidden_key_type_message - allowed_types = - Gitlab::CurrentSettings - .allowed_key_types - .map(&:upcase) - .to_sentence(last_word_connector: ', or ', two_words_connector: ' or ') + allowed_types = Gitlab::CurrentSettings.allowed_key_types.map(&:upcase) - "type is forbidden. Must be #{allowed_types}" + "type is forbidden. Must be #{Gitlab::Utils.to_exclusive_sentence(allowed_types)}" end end -- cgit v1.2.1