diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-12-23 00:54:08 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-12-23 00:54:08 +0300 |
commit | bed476041fab267b42e89d31d09a683d1b67b650 (patch) | |
tree | a828edff326fc53b7fde56e4de8426f3a3158eb8 /doc | |
parent | 05347e0748118d95724e2bd842f690cba5b03f8e (diff) |
Add images to issue creation from unresolved discussions
[ci skip]
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png | bin | 0 -> 11123 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/img/resolve_discussion_open_issue.png | bin | 0 -> 20967 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/merge_request_discussion_resolution.md | 8 |
3 files changed, 6 insertions, 2 deletions
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 Binary files differnew file mode 100644 index 00000000000..8c7ce215ae0 --- /dev/null +++ b/doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png 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 Binary files differnew file mode 100644 index 00000000000..98d63278326 --- /dev/null +++ b/doc/user/project/merge_requests/img/resolve_discussion_open_issue.png 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 |