From bed476041fab267b42e89d31d09a683d1b67b650 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Thu, 22 Dec 2016 23:54:08 +0200 Subject: Add images to issue creation from unresolved discussions [ci skip] --- .../img/resolve_discussion_issue_notice.png | Bin 0 -> 11123 bytes .../img/resolve_discussion_open_issue.png | Bin 0 -> 20967 bytes .../merge_request_discussion_resolution.md | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png create mode 100644 doc/user/project/merge_requests/img/resolve_discussion_open_issue.png (limited to 'doc') diff --git a/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png b/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png new file mode 100644 index 00000000000..8c7ce215ae0 Binary files /dev/null and b/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png differ diff --git a/doc/user/project/merge_requests/img/resolve_discussion_open_issue.png b/doc/user/project/merge_requests/img/resolve_discussion_open_issue.png new file mode 100644 index 00000000000..98d63278326 Binary files /dev/null and b/doc/user/project/merge_requests/img/resolve_discussion_open_issue.png differ diff --git a/doc/user/project/merge_requests/merge_request_discussion_resolution.md b/doc/user/project/merge_requests/merge_request_discussion_resolution.md index f37f1ce4d21..d4b85676d19 100644 --- a/doc/user/project/merge_requests/merge_request_discussion_resolution.md +++ b/doc/user/project/merge_requests/merge_request_discussion_resolution.md @@ -51,13 +51,15 @@ are resolved. ![Only allow merge if all the discussions are resolved message](img/only_allow_merge_if_all_discussions_are_resolved_msg.png) -### Move all unresolved discussions in a merge request to an issue +## Move all unresolved discussions in a merge request to an issue -> [Introduced][ce-7180] (Currently on Backlog) +> [Introduced][ce-7180] in GitLab 8.15. To delegate unresolved discussions to a new issue you can click the link **open an issue to resolve them later**. +![Open new issue from unresolved discussions](img/resolve_discussion_open_issue.png) + This will prepare an issue with content referring to the merge request and discussions. @@ -66,6 +68,8 @@ discussions. Hitting **Submit issue** will cause all discussions to be marked as resolved and add a note referring to the newly created issue. +![Mark discussions as resolved notice](img/resolve_discussion_issue_notice.png) + You can now proceed to merge the merge request from the UI. [ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022 -- cgit v1.2.3