summaryrefslogtreecommitdiff
path: root/app/models/label.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-02-25 13:49:42 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-03 10:41:11 +0100
commita472c1bfd0b5c09e2c9b9da5ff0de3c90aaeda2f (patch)
tree78d222497df7be5d652e96e85779abbb75bc9bfb /app/models/label.rb
parentdbc7bf7fe14249fdc1168c84bdfaad07bfbbbec0 (diff)
downloadgitlab-ce-a472c1bfd0b5c09e2c9b9da5ff0de3c90aaeda2f.tar.gz
Add support for cross project references for labels
Diffstat (limited to 'app/models/label.rb')
-rw-r--r--app/models/label.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/label.rb b/app/models/label.rb
index 445f22ee1e0..c6abd6c9712 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -51,7 +51,8 @@ class Label < ActiveRecord::Base
# Pattern used to extract label references from text
def self.reference_pattern
%r{
- #{reference_prefix}
+ (#{Project.reference_pattern})?
+ #{Regexp.escape(reference_prefix)}
(?:
(?<label_id>\d+) | # Integer-based label ID, or
(?<label_name>
@@ -62,6 +63,10 @@ class Label < ActiveRecord::Base
}x
end
+ def self.link_reference_pattern
+ nil
+ end
+
# Returns the String necessary to reference this Label in Markdown
#
# format - Symbol format to use (default: :id, optional: :name)