diff options
author | Robert Speicher <robert@gitlab.com> | 2016-07-13 19:59:55 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-07-13 19:59:55 +0000 |
commit | 7968484dfa363537e6e7822ca1ec100bcd0ec4f8 (patch) | |
tree | 5a956fda0531940e2a6de08cfba28febd362c108 /app | |
parent | 997e2d1a65e738253b327f1b21389c42ca5a3e5f (diff) | |
parent | a4147af674e851d50c71e982475f04195d1a3015 (diff) | |
download | gitlab-ce-7968484dfa363537e6e7822ca1ec100bcd0ec4f8.tar.gz |
Merge branch 'fix-label-reference-filter' into 'master'
Fix markdown rendering for label references
Fixes #14424, #19753, #19760
See merge request !5224
Diffstat (limited to 'app')
-rw-r--r-- | app/models/label.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index dc5586f5756..35e678001dc 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -52,14 +52,17 @@ class Label < ActiveRecord::Base # This pattern supports cross-project references. # def self.reference_pattern + # NOTE: The id pattern only matches when all characters on the expression + # are digits, so it will match ~2 but not ~2fa because that's probably a + # label name and we want it to be matched as such. @reference_pattern ||= %r{ (#{Project.reference_pattern})? #{Regexp.escape(reference_prefix)} (?: - (?<label_id>\d+) | # Integer-based label ID, or + (?<label_id>\d+(?!\S\w)\b) | # Integer-based label ID, or (?<label_name> - [A-Za-z0-9_\-\?&]+ | # String-based single-word label title, or - "[^,]+" # String-based multi-word label surrounded in quotes + [A-Za-z0-9_\-\?\.&]+ | # String-based single-word label title, or + ".+?" # String-based multi-word label surrounded in quotes ) ) }x |