diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-06 14:04:14 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-06 14:04:14 +0000 |
commit | d9ef41cf4dd89716854ef27c4c6cbd93746e426a (patch) | |
tree | 4832a35d5cb7fa34b6ba4fdd06ada89dd123b33b /doc/user | |
parent | e1198d4fe5cc24b6d3ca1368dd2300c9f4351cb5 (diff) | |
parent | 1123057ab792ac73b1611f4d3a9faf79369dd6da (diff) | |
download | gitlab-ce-d9ef41cf4dd89716854ef27c4c6cbd93746e426a.tar.gz |
Merge branch '23589-open-issue-for-mr' into 'master'
Create an issue for all unresolved discussions in an MR
See merge request !7180
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/merge_requests/img/preview_issue_for_discussions.png | bin | 0 -> 178361 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/merge_request_discussion_resolution.md | 21 |
2 files changed, 20 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/img/preview_issue_for_discussions.png b/doc/user/project/merge_requests/img/preview_issue_for_discussions.png Binary files differnew file mode 100644 index 00000000000..9fdd387676c --- /dev/null +++ b/doc/user/project/merge_requests/img/preview_issue_for_discussions.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 285b1798ac5..f37f1ce4d21 100644 --- a/doc/user/project/merge_requests/merge_request_discussion_resolution.md +++ b/doc/user/project/merge_requests/merge_request_discussion_resolution.md @@ -37,7 +37,8 @@ resolved discussions tracker. > [Introduced][ce-7125] in GitLab 8.14. -You can prevent merge requests from being merged until all discussions are resolved. +You can prevent merge requests from being merged until all discussions are +resolved. Navigate to your project's settings page, select the **Only allow merge requests to be merged if all discussions are resolved** check @@ -50,8 +51,26 @@ 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 + +> [Introduced][ce-7180] (Currently on Backlog) + +To delegate unresolved discussions to a new issue you can click the link **open +an issue to resolve them later**. + +This will prepare an issue with content referring to the merge request and +discussions. + +![Issue mentioning discussions in a merge request](img/preview_issue_for_discussions.png) + +Hitting **Submit issue** will cause all discussions to be marked as resolved and +add a note referring to the newly created issue. + +You can now proceed to merge the merge request from the UI. + [ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022 [ce-7125]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7125 +[ce-7180]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180 [resolve-discussion-button]: img/resolve_discussion_button.png [resolve-comment-button]: img/resolve_comment_button.png [discussion-view]: img/discussion_view.png |