summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-04-21 16:43:54 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-04-21 16:43:54 +0000
commit2cd501f7e4f1f0e5461aa1fe994b214357fcdc5e (patch)
treeaf84f0225d0ea937055256cb878177a3e902ad45 /doc
parent6750e2d53f2e2a4cb15bbc159f29cf4c55e5db4b (diff)
parentb38942462792f896dace358c7fe32cd7c159e793 (diff)
downloadgitlab-ce-2cd501f7e4f1f0e5461aa1fe994b214357fcdc5e.tar.gz
Merge branch 'rs-reference-filters' into 'master'
Convert GFM reference handling to html-pipeline filters - `Gitlab::Markdown` is now much cleaner - Better separation of concerns - Cleaner, less brittle, more maintainable specs for each reference type. - Label references actually work! See merge request !1753
Diffstat (limited to 'doc')
-rw-r--r--doc/markdown/markdown.md39
1 files changed, 25 insertions, 14 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 1d5fd4c8b0d..8ec5a20035f 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -163,7 +163,7 @@ Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported
## Special GitLab References
-GFM recognized special references.
+GFM recognizes special references.
You can easily reference e.g. an issue, a commit, a team member or even the whole team within a project.
@@ -171,19 +171,30 @@ GFM will turn that reference into a link so you can navigate between them easily
GFM will recognize the following:
-- @foo : for specific team members or groups
-- @all : for the whole team
-- #123 : for issues
-- !123 : for merge requests
-- $123 : for snippets
-- 1234567 : for commits
-- \[file\](path/to/file) : for file references
-
-GFM also recognizes references to commits, issues, and merge requests in other projects:
-
-- namespace/project#123 : for issues
-- namespace/project!123 : for merge requests
-- namespace/project@1234567 : for commits
+| input | references |
+|-----------------------:|:---------------------------|
+| `@user_name` | specific user |
+| `@group_name` | specific group |
+| `@all` | entire team |
+| `#123` | issue |
+| `!123` | merge request |
+| `$123` | snippet |
+| `~123` | label by ID |
+| `~bug` | one-word label by name |
+| `~"feature request"` | multi-word label by name |
+| `9ba12248` | specific commit |
+| `9ba12248...b19a04f5` | commit range comparison |
+| `[README](doc/README)` | repository file references |
+
+GFM also recognizes certain cross-project references:
+
+| input | references |
+|----------------------------------------:|:------------------------|
+| `namespace/project#123` | issue |
+| `namespace/project!123` | merge request |
+| `namespace/project$123` | snippet |
+| `namespace/project@9ba12248` | specific commit |
+| `namespace/project@9ba12248...b19a04f5` | commit range comparison |
## Task Lists