diff options
author | James Lopez <james@jameslopez.es> | 2016-02-02 15:15:59 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-02-02 15:15:59 +0100 |
commit | ae73e73beef078b83955bf55dcf3e07cbe5afcf5 (patch) | |
tree | 16351427291ce4acf039d92711cb744302e4a919 /lib | |
parent | 94b27f9d795c05134a777f754adbea2ab3accd33 (diff) | |
parent | 6cffcb05882b0d3c4a02f9acf21806e25ea09ec3 (diff) | |
download | gitlab-ce-ae73e73beef078b83955bf55dcf3e07cbe5afcf5.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/regex.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index 3331bd123b2..ace906a6f59 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -44,19 +44,19 @@ module Gitlab def file_name_regex - @file_name_regex ||= /\A[a-zA-Z0-9_\-\.]*\z/.freeze + @file_name_regex ||= /\A[a-zA-Z0-9_\-\.\@]*\z/.freeze end def file_name_regex_message - "can contain only letters, digits, '_', '-' and '.'. " + "can contain only letters, digits, '_', '-', '@' and '.'. " end def file_path_regex - @file_path_regex ||= /\A[a-zA-Z0-9_\-\.\/]*\z/.freeze + @file_path_regex ||= /\A[a-zA-Z0-9_\-\.\/\@]*\z/.freeze 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 |