summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-01 16:20:49 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-01 16:20:49 +0100
commit72bd004b3114fad43feaa7d21e0c2cde4b5b6a0d (patch)
tree5ea903605c86e8af0fcb0a0cf6ac600e7d3b5b3a /lib/gitlab
parentda8e0f86595299740a344309cb5963854b61c4a6 (diff)
downloadgitlab-ce-72bd004b3114fad43feaa7d21e0c2cde4b5b6a0d.tar.gz
Allow "@" in file names and pathallow-@
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/regex.rb8
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