diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 22:51:42 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 22:51:42 +0000 |
| commit | 229eb732f58f5dfd23df0a499e8ff49368a57b52 (patch) | |
| tree | e9c5db28d760c3816b8b20e71969f7f9d149697e | |
| parent | c530ca00b0f40ec0e0df4d1885ce55e47a59b70d (diff) | |
| parent | 8d0690c5c768415a5dae1155c236f7650ea894cf (diff) | |
| download | gitlab-ce-229eb732f58f5dfd23df0a499e8ff49368a57b52.tar.gz | |
Merge branch 'project-refs-with-digit-prefix' into 'master'
Support referencing issues to a project whose name starts with a digit
Gitlab supports adding users or projects whose name starts with a "_" or a digit, but the regexp in markdown.rb enforces "a-zA-Z" for the first character.
This change allows to reference issues or merge requests in other projects whose name starts with a digit, like `owner/2ndtestproject#123` or `2nduser/superproject!123`.
See merge request !264
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/markdown.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index dae32953cd9..6bd93b8cd4b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,6 +23,7 @@ v 7.8.1 - Fix urls for the issues when relative url was enabled - Add Bitbucket omniauth provider. - Add Bitbucket importer. + - Support referencing issues to a project whose name starts with a digit v 7.8.0 - Fix access control and protection against XSS for note attachments and other uploads. diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index a1fd794aed2..d85c2ee4f2d 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -121,7 +121,7 @@ module Gitlab text end - NAME_STR = '[a-zA-Z][a-zA-Z0-9_\-\.]*' + NAME_STR = '[a-zA-Z0-9_][a-zA-Z0-9_\-\.]*' PROJ_STR = "(?<project>#{NAME_STR}/#{NAME_STR})" REFERENCE_PATTERN = %r{ |