diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-26 12:04:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-26 12:04:44 +0000 |
| commit | ee5cc454d78f0f244fb99f0ec3f5060fd1905c48 (patch) | |
| tree | 44f055bddfdc30acc131fc1e52f530986aba2e91 /doc/development | |
| parent | 0ebd50ce0015a6a1dcd273cada9d9be8c20a12bb (diff) | |
| parent | c6f0f8f0d4ab44f5f770b248383c783aee306192 (diff) | |
| download | gitlab-ce-ee5cc454d78f0f244fb99f0ec3f5060fd1905c48.tar.gz | |
Merge branch 'ux-guide-copy-discussion' into 'master'
UX Guide: add comment and discussion to copy
See merge request !8206
Diffstat (limited to 'doc/development')
| -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 |