Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-14 12:59:06 +0300
committerRémy Coutable <remy@rymai.me>2016-11-14 12:59:06 +0300
commit006c163b53d062d990ac213deac70978b0a927cc (patch)
tree36dced4c3ba22fa3449e4b09c05bfa07a7eda003 /lib
parentb44237f576e47b38299fab5a6d28aa49bc63970e (diff)
parentaf941732ed92ad44a7568964e2a9191d0c72164c (diff)
Merge branch 'repository-name-emojis' into 'master'
Added ability to put emojis into repository name ## Are there points in the code the reviewer needs to double check? Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt See merge request !7420
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/regex.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index cb1659f9cee..155ca47e04c 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -26,12 +26,12 @@ module Gitlab
end
def project_name_regex
- @project_name_regex ||= /\A[\p{Alnum}_][\p{Alnum}\p{Pd}_\. ]*\z/.freeze
+ @project_name_regex ||= /\A[\p{Alnum}\u{00A9}-\u{1f9c0}_][\p{Alnum}\p{Pd}\u{00A9}-\u{1f9c0}_\. ]*\z/.freeze
end
def project_name_regex_message
- "can contain only letters, digits, '_', '.', dash and space. " \
- "It must start with letter, digit or '_'."
+ "can contain only letters, digits, emojis, '_', '.', dash, space. " \
+ "It must start with letter, digit, emoji or '_'."
end
def project_path_regex