diff options
| author | Ashley Dumaine <adumaine@datto.com> | 2017-09-01 18:39:22 -0400 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-09-06 10:07:47 +0100 |
| commit | a3f76b76a4b8db85c6fa557a5e801dcea7195735 (patch) | |
| tree | 730f99b9e673ed511a41113cd713ed39702c839f /doc/user/discussions | |
| parent | 959e6d221d6b11c64d17fc9d4734200806c293ab (diff) | |
| download | gitlab-ce-a3f76b76a4b8db85c6fa557a5e801dcea7195735.tar.gz | |
change collapse to resolve and comments to discussions
Diffstat (limited to 'doc/user/discussions')
| -rw-r--r-- | doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png | bin | 129633 -> 0 bytes | |||
| -rw-r--r-- | doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png | bin | 0 -> 107568 bytes | |||
| -rw-r--r-- | doc/user/discussions/index.md | 11 |
3 files changed, 5 insertions, 6 deletions
diff --git a/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png b/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png Binary files differdeleted file mode 100644 index 4c273637bfc..00000000000 --- a/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png +++ /dev/null diff --git a/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png b/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png Binary files differnew file mode 100644 index 00000000000..500c24ee175 --- /dev/null +++ b/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index 5771b420fdf..b2264c15d63 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -116,18 +116,17 @@ are resolved.  -### Automatically collapse outdated diff comments regardless of discussion resolution +### Automatically resolve merge request diffs discussions on lines changed with a push -You can automatically collapse comments on outdated diffs regardless of whether -the discussion is resolved. +You can automatically resolve merge request diff discussions on lines modified with a new commit. Navigate to your project's settings page, select the -**Collapse outdated diffs regardless of discussion resolution** check box and hit +**Automatically resolve merge request diffs discussions on lines changed with a push** check box and hit **Save** for the changes to take effect. - + -From now on, any discussions on an outdated diff will be collapsed by default. +From now on, any discussions on an outdated diff will be resolved by default. ## Threaded discussions |
