summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Packham (GitLab) <sean@seanpackham.com>2017-05-20 11:10:41 +0000
committerSean Packham (GitLab) <sean@seanpackham.com>2017-05-20 11:10:41 +0000
commit604c28b23728a5f738b9b8204accaf100c7f823c (patch)
tree463821e21cc56d989360b958a44267ffa063547b
parent09c5885adde6ea28e9d5810e6c30d49d76f0e6e9 (diff)
parent1f00c74b900c5d8ed34fec8d0a1e07b4585004c9 (diff)
downloadgitlab-ce-604c28b23728a5f738b9b8204accaf100c7f823c.tar.gz
Merge branch 'docs/add-comment-snippets' into 'master'
Adds "comments on snippets" to doc Closes #32575 See merge request !11563
-rw-r--r--doc/user/img/gitlab_snippet.pngbin0 -> 34355 bytes
-rw-r--r--doc/user/snippets.md10
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/user/img/gitlab_snippet.png b/doc/user/img/gitlab_snippet.png
new file mode 100644
index 00000000000..718347fc2d4
--- /dev/null
+++ b/doc/user/img/gitlab_snippet.png
Binary files differ
diff --git a/doc/user/snippets.md b/doc/user/snippets.md
index 417360e08ac..78861625f8a 100644
--- a/doc/user/snippets.md
+++ b/doc/user/snippets.md
@@ -2,8 +2,18 @@
Snippets are little bits of code or text.
+![GitLab Snippet](img/gitlab_snippet.png)
+
There are 2 types of snippets - project snippets and personal snippets.
+## Comments
+
+With GitLab Snippets you engage in a conversation about that piece of code,
+facilitating the collaboration among users.
+
+> **Note:**
+Comments on snippets was [introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/12910) in [GitLab Community Edition 9.2](https://about.gitlab.com/2017/05/22/gitlab-9-2-released/#comments-for-personal-snippets).
+
## Project snippets
Project snippets are always related to a specific project - see [Project features](../workflow/project_features.md) for more information.