diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-12 18:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-12 18:08:59 +0000 |
| commit | 6d533fe8b44007d82b8de29a4b706da69e5f5936 (patch) | |
| tree | f02d924a3b8f81ca28852c993831fcf596417f1b /doc/user | |
| parent | f44248b613e94534fd6a1b1f8fb6df179f1bbf56 (diff) | |
| download | gitlab-ce-6d533fe8b44007d82b8de29a4b706da69e5f5936.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/discussions/index.md | 4 | ||||
| -rw-r--r-- | doc/user/markdown.md | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index 6268b525755..9320dbba1b8 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -7,9 +7,9 @@ type: reference, howto # Threads **(FREE)** -You can use words to communicate with other users all over GitLab. +GitLab encourages communication through comments, threads, and suggestions. -For example, you can leave a comment in the following places: +For example, you can create a comment in the following places: - Issues - Epics diff --git a/doc/user/markdown.md b/doc/user/markdown.md index afad68c5554..5f974d75522 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -444,6 +444,7 @@ GFM recognizes the following: | snippet | `$123` | `namespace/project$123` | `project$123` | | epic **(ULTIMATE)** | `&123` | `group1/subgroup&123` | | | vulnerability **(ULTIMATE)** (1)| `[vulnerability:123]` | `[vulnerability:namespace/project/123]` | `[vulnerability:project/123]` | +| feature flag | `[feature_flag:123]` | `[feature_flag:namespace/project/123]` | `[feature_flag:project/123]` | | label by ID | `~123` | `namespace/project~123` | `project~123` | | one-word label by name | `~bug` | `namespace/project~bug` | `project~bug` | | multi-word label by name | `~"feature request"` | `namespace/project~"feature request"` | `project~"feature request"` | |