diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-09-05 16:49:05 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-09-06 10:08:03 +0100 |
| commit | e8f29569bcb4a2d732a2c00b34958f58d5622836 (patch) | |
| tree | 41b69a559246c423699c741d2f9f252911a2e525 /doc | |
| parent | ac816d90d4cc116117497479f400211a43db6be1 (diff) | |
| download | gitlab-ce-e8f29569bcb4a2d732a2c00b34958f58d5622836.tar.gz | |
Resolve outdated diff discussions on push
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png | bin | 107568 -> 0 bytes | |||
| -rw-r--r-- | doc/user/discussions/img/automatically_resolve_outdated_discussions.png | bin | 0 -> 117604 bytes | |||
| -rw-r--r-- | doc/user/discussions/index.md | 18 |
3 files changed, 12 insertions, 6 deletions
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 differdeleted file mode 100644 index 500c24ee175..00000000000 --- a/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png +++ /dev/null diff --git a/doc/user/discussions/img/automatically_resolve_outdated_discussions.png b/doc/user/discussions/img/automatically_resolve_outdated_discussions.png Binary files differnew file mode 100644 index 00000000000..9a798ddd178 --- /dev/null +++ b/doc/user/discussions/img/automatically_resolve_outdated_discussions.png diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index b2264c15d63..efea99eb120 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -116,17 +116,22 @@ are resolved.  -### Automatically resolve merge request diffs discussions on lines changed with a push +### Automatically resolve merge request diff discussions when they become outdated -You can automatically resolve merge request diff discussions on lines modified with a new commit. +> [Introduced][ce-14053] in GitLab 10.0. -Navigate to your project's settings page, select the -**Automatically resolve merge request diffs discussions on lines changed with a push** check box and hit +You can automatically resolve merge request diff discussions on lines modified +with a new push. + +Navigate to your project's settings page, select the **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 resolved by default. +From now on, any discussions on a diff will be resolved by default if a push +makes that diff section outdated. Discussions on lines that don't change and +top-level resolvable discussions are not automatically resolved. ## Threaded discussions @@ -153,6 +158,7 @@ comments in greater detail. [ce-7527]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7527 [ce-7180]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180 [ce-8266]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8266 +[ce-14053]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14053 [resolve-discussion-button]: img/resolve_discussion_button.png [resolve-comment-button]: img/resolve_comment_button.png [discussion-view]: img/discussion_view.png |
