From e8f29569bcb4a2d732a2c00b34958f58d5622836 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 5 Sep 2017 16:49:05 +0100 Subject: Resolve outdated diff discussions on push --- ...utomatically_resolve_outdated_diff_discussions.png | Bin 107568 -> 0 bytes .../automatically_resolve_outdated_discussions.png | Bin 0 -> 117604 bytes doc/user/discussions/index.md | 18 ++++++++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png create mode 100644 doc/user/discussions/img/automatically_resolve_outdated_discussions.png (limited to 'doc') diff --git a/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png b/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png deleted file mode 100644 index 500c24ee175..00000000000 Binary files a/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png and /dev/null differ diff --git a/doc/user/discussions/img/automatically_resolve_outdated_discussions.png b/doc/user/discussions/img/automatically_resolve_outdated_discussions.png new file mode 100644 index 00000000000..9a798ddd178 Binary files /dev/null and b/doc/user/discussions/img/automatically_resolve_outdated_discussions.png differ 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. ![Only allow merge if all the discussions are resolved message](img/only_allow_merge_if_all_discussions_are_resolved_msg.png) -### 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. -![Automatically resolve merge request diffs discussions on lines changed with a push](img/automatically_resolve_outdated_diff_discussions.png) +![Automatically resolve merge request diff discussions when they become outdated](img/automatically_resolve_outdated_discussions.png) -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 -- cgit v1.2.1