diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-07 22:22:41 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-07 22:22:41 +0300 |
| commit | 4e2b630df716174ea9b07319a0fd5eda7b60cf8e (patch) | |
| tree | c3d1a509818b86bc8bbc96cb84bae8113cfe7868 /doc | |
| parent | bc648ae5d225b3b76cc3105681e2f404a5918f85 (diff) | |
| parent | df00ebded67e871dfab226db3ffadc3dd6807d79 (diff) | |
Merge branch 'group-milestone-references-system-notes' into 'master'
Support group milestone references
Closes #34778
See merge request !13289
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/markdown.md | 6 | ||||
| -rw-r--r-- | doc/user/project/milestones/index.md | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 0d29b471d52..b42b8f0a525 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -248,7 +248,7 @@ GFM will recognize the following: | `~123` | label by ID | | `~bug` | one-word label by name | | `~"feature request"` | multi-word label by name | -| `%123` | milestone by ID | +| `%123` | project milestone by ID | | `%v1.23` | one-word milestone by name | | `%"release candidate"` | multi-word milestone by name | | `9ba12248` | specific commit | @@ -262,7 +262,7 @@ GFM also recognizes certain cross-project references: |:----------------------------------------|:------------------------| | `namespace/project#123` | issue | | `namespace/project!123` | merge request | -| `namespace/project%123` | milestone | +| `namespace/project%123` | project milestone | | `namespace/project$123` | snippet | | `namespace/project@9ba12248` | specific commit | | `namespace/project@9ba12248...b19a04f5` | commit range comparison | @@ -274,7 +274,7 @@ It also has a shorthand version to reference other projects from the same namesp |:------------------------------|:------------------------| | `project#123` | issue | | `project!123` | merge request | -| `project%123` | milestone | +| `project%123` | project milestone | | `project$123` | snippet | | `project@9ba12248` | specific commit | | `project@9ba12248...b19a04f5` | commit range comparison | diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md index 23ffde4e8bd..876b98a4dc5 100644 --- a/doc/user/project/milestones/index.md +++ b/doc/user/project/milestones/index.md @@ -56,4 +56,5 @@ total merge requests and issues. ## Quick actions -[Quick actions](../quick_actions.md) are available for assigning and removing project milestones only. [In the future](https://gitlab.com/gitlab-org/gitlab-ce/issues/34778), this will also apply to group milestones. +[Quick actions](../quick_actions.md) are available for assigning and removing +project and group milestones. |