diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 16:44:02 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-21 14:35:48 +0200 |
| commit | 4179bff027af604ba342cc6777aa41f3da1aa99f (patch) | |
| tree | 995147ffcf2f81ac0d4d03aa59d9b10de4ec1d19 | |
| parent | 26e7c5be527768f0e09db3eb59fc3c29e0364ee3 (diff) | |
| download | gitlab-ce-4179bff027af604ba342cc6777aa41f3da1aa99f.tar.gz | |
Added new discussions docs
| -rw-r--r-- | doc/user/discussions.md | 10 | ||||
| -rw-r--r-- | doc/user/img/comment_type_toggle.gif | bin | 0 -> 70796 bytes | |||
| -rw-r--r-- | doc/user/img/discussion_comment.png | bin | 0 -> 57189 bytes |
3 files changed, 8 insertions, 2 deletions
diff --git a/doc/user/discussions.md b/doc/user/discussions.md index 23a4dee94c6..2276bf1971e 100644 --- a/doc/user/discussions.md +++ b/doc/user/discussions.md @@ -128,6 +128,12 @@ You can now proceed to merge the merge request from the UI. Discussions can be started on issues, commits, snippets and merge requests. -Resolvable discussions can be added to merge request diffs, but they can also be added without a diff. +Resolvable discussions can be added to merge request diffs, but discussions can also be added without a diff. -To start a resolvable discussion, you can click on the `Comment` button dropdown and select `Start discussion`. +To start a discussion, you can click on the "Comment" button toggle dropdown, select "Start discussion" and click "Start discussion" when you're ready to post the comment. + + + +This will post a comment with a single thread to allow you to discuss specific comments in greater detail. + + diff --git a/doc/user/img/comment_type_toggle.gif b/doc/user/img/comment_type_toggle.gif Binary files differnew file mode 100644 index 00000000000..b73c197b97f --- /dev/null +++ b/doc/user/img/comment_type_toggle.gif diff --git a/doc/user/img/discussion_comment.png b/doc/user/img/discussion_comment.png Binary files differnew file mode 100644 index 00000000000..8f66d138922 --- /dev/null +++ b/doc/user/img/discussion_comment.png |
