diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-20 10:23:18 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-09-20 10:23:18 +0300 |
commit | 95b9421ad3b2678da6e0af0131eafd52cdd0b2a5 (patch) | |
tree | cedbb7c945c4c9e1a70842152b69efa9d7fbf6b8 /lib | |
parent | 7ff6f507fcbe285f4a1a62ff71681107a513581a (diff) | |
parent | 313f3181cc75b8d12468d03e6aa7ed2bf5bba871 (diff) |
Merge branch 'rs-trailing-spaces-in-regex-messages' into 'master'
Remove trailing spaces from messages in Gitlab::Regex
See merge request !6426
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/regex.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index bc8bbf337f3..776bbcbb5d0 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -44,7 +44,7 @@ module Gitlab end def file_name_regex_message - "can contain only letters, digits, '_', '-', '@' and '.'. " + "can contain only letters, digits, '_', '-', '@' and '.'." end def file_path_regex @@ -52,7 +52,7 @@ module Gitlab end def file_path_regex_message - "can contain only letters, digits, '_', '-', '@' and '.'. Separate directories with a '/'. " + "can contain only letters, digits, '_', '-', '@' and '.'. Separate directories with a '/'." end def directory_traversal_regex @@ -60,7 +60,7 @@ module Gitlab end def directory_traversal_regex_message - "cannot include directory traversal. " + "cannot include directory traversal." end def archive_formats_regex |