Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 6 deletions

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