diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 03:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 03:07:43 +0300 |
| commit | 2b3bfe8fc59ed4cdc385955cdb38cbd481b45426 (patch) | |
| tree | 6b570a8d134fb2beeacf11bbcc79ff22123156ec /app/validators | |
| parent | d203316c80aa27cf747aa29df9f7c2d374965b5f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/key_restriction_validator.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/validators/key_restriction_validator.rb b/app/validators/key_restriction_validator.rb index 891d13b1596..9809047ae83 100644 --- a/app/validators/key_restriction_validator.rb +++ b/app/validators/key_restriction_validator.rb @@ -21,7 +21,8 @@ class KeyRestrictionValidator < ActiveModel::EachValidator def supported_sizes_message sizes = self.class.supported_sizes(options[:type]) - sizes.to_sentence(last_word_connector: ', or ', two_words_connector: ' or ') + + Gitlab::Utils.to_exclusive_sentence(sizes) end def valid_restriction?(value) |