diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 17:06:19 +0300 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 17:06:19 +0300 |
commit | 15a1acb4796406155fb01c2d93747b66697f50c0 (patch) | |
tree | 1ab73338bfa9bf2e56f8238d532e627f9e1f5b38 /lib | |
parent | b67f8eee0d2810be4a010c5e968e1848b4ca3c88 (diff) | |
parent | 6cffcb05882b0d3c4a02f9acf21806e25ea09ec3 (diff) |
Merge remote-tracking branch 'origin/master' into git-raw-workhorse
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 53ab2686b43..5c35c5b1450 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 |