summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-13 13:19:28 +0000
committerRémy Coutable <remy@rymai.me>2016-12-13 13:19:28 +0000
commit0764c2ead1cc3ee3778a24218412317ba19b5e83 (patch)
tree36fdc74eb42e635f4124d33ae5d68fa25ec9bad0 /lib
parent8f299a5825997eb279011d67565689d506bf7d66 (diff)
parent61aa90ef2089c9d840b88f14a553ef0dd49b779f (diff)
downloadgitlab-ce-0764c2ead1cc3ee3778a24218412317ba19b5e83.tar.gz
Merge branch 'allow-more-filenames' into 'master'
Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/regex.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index a06cf6a989c..d9d1e3cccca 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -61,7 +61,7 @@ module Gitlab
end
def file_name_regex
- @file_name_regex ||= /\A[a-zA-Z0-9_\-\.\@]*\z/.freeze
+ @file_name_regex ||= /\A[[[:alnum:]]_\-\.\@]*\z/.freeze
end
def file_name_regex_message
@@ -69,7 +69,7 @@ module Gitlab
end
def file_path_regex
- @file_path_regex ||= /\A[a-zA-Z0-9_\-\.\/\@]*\z/.freeze
+ @file_path_regex ||= /\A[[[:alnum:]]_\-\.\/\@]*\z/.freeze
end
def file_path_regex_message