summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-01 11:39:49 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-03 10:41:11 +0100
commitd49c8e8e3d0f0dee7886d421c91684d92f89c78e (patch)
treebd616e5f4d3a30d5aa8275f61a71d14af356077d
parent53c351a2a573cb448eafdc8ed7e187225f6aa012 (diff)
downloadgitlab-ce-d49c8e8e3d0f0dee7886d421c91684d92f89c78e.tar.gz
Mention cross-project labels in markdown documentation
-rw-r--r--app/models/label.rb4
-rw-r--r--doc/markdown/markdown.md1
2 files changed, 5 insertions, 0 deletions
diff --git a/app/models/label.rb b/app/models/label.rb
index 1bb4f35cea2..f8817d9dc54 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -48,7 +48,11 @@ class Label < ActiveRecord::Base
'~'
end
+ ##
# Pattern used to extract label references from text
+ #
+ # This pattern supports cross-project references.
+ #
def self.reference_pattern
%r{
(#{Project.reference_pattern})?
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index c400cdac64d..cbf57db5684 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -207,6 +207,7 @@ GFM also recognizes certain cross-project references:
| `namespace/project$123` | snippet |
| `namespace/project@9ba12248` | specific commit |
| `namespace/project@9ba12248...b19a04f5` | commit range comparison |
+| `namespace/project~"Some label"` | issues with given label |
## Task Lists