diff options
| author | Allison Whilden <allison@gitlab.com> | 2016-12-20 22:52:05 +0300 |
|---|---|---|
| committer | Allison Whilden <allison@gitlab.com> | 2016-12-22 19:38:46 +0300 |
| commit | c6f0f8f0d4ab44f5f770b248383c783aee306192 (patch) | |
| tree | 1ece5a374ebcd965fdd558bc912f88f1dfdca65e /doc | |
| parent | 8dfa41016b2830fa9cfcf87e55e42e6a2a8c9a07 (diff) | |
[ci skip] UX Guide: add comment and discussion to copy
[ci skip] UX Guide: refine discussion definition
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/ux_guide/copy.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/development/ux_guide/copy.md b/doc/development/ux_guide/copy.md index 8896d450f14..e48897426cb 100644 --- a/doc/development/ux_guide/copy.md +++ b/doc/development/ux_guide/copy.md @@ -101,3 +101,11 @@ The form should be titled `Edit issue`. The submit button should be labeled `Sav | Approve | Approve an open merge request || | Remove approval, unapproved | Remove approval of an open merge request | Do not use `unapprove` as that is not an English word| | Merge | Merge an open merge request || + +### Comments & Discussions + +#### Comment +A **comment** is a written piece of text that users of GitLab can create. Comments have the meta data of author and time stamp. Comments can be added in a variety of contexts, such as issues, merge requests, and discussions. + +#### Dicussion +A **discussion** is a group of 1 or more comments. A discussion can include sub discussions. Some discussions have the special capability of being able to be **resolved**. Both the comments in the discussion and the discussion itself can be resolved.
\ No newline at end of file |