summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-02-27 16:01:56 +0100
committerBob Van Landuyt <bob@gitlab.com>2017-03-13 08:27:51 +0100
commitd6453e75b7100ee94c3d125d21627961adcaa8cc (patch)
tree08e0f7f1604d156b5fdfcf059f16317137784c74 /doc/user/project/merge_requests
parentf86928953d2d79f40f10813a6e244c1da0779d16 (diff)
downloadgitlab-ce-d6453e75b7100ee94c3d125d21627961adcaa8cc.tar.gz
Add a button to delegate all discussions in a merge request
Diffstat (limited to 'doc/user/project/merge_requests')
-rw-r--r--doc/user/project/merge_requests/img/btn_new_issue_for_all_discussions.pngbin0 -> 29007 bytes
-rw-r--r--doc/user/project/merge_requests/merge_request_discussion_resolution.md14
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/user/project/merge_requests/img/btn_new_issue_for_all_discussions.png b/doc/user/project/merge_requests/img/btn_new_issue_for_all_discussions.png
new file mode 100644
index 00000000000..b15447ec290
--- /dev/null
+++ b/doc/user/project/merge_requests/img/btn_new_issue_for_all_discussions.png
Binary files 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 63274c86bbb..230e957f045 100644
--- a/doc/user/project/merge_requests/merge_request_discussion_resolution.md
+++ b/doc/user/project/merge_requests/merge_request_discussion_resolution.md
@@ -53,12 +53,18 @@ are resolved.
## Move all unresolved discussions in a merge request to an issue
-> [Introduced][ce-7180] in GitLab 8.15.
+> [Introduced][ce-8266]
+
+To continue all open discussions in a merge request, click the button **Resolve
+all discussions in new issue**
+
+![Open new issue for all unresolved discussions](img/btn_new_issue_for_all_discussions.png)
-To delegate unresolved discussions to a new issue you can click the link **open
-an issue to resolve them later**.
+Alternatively, when your project only accepts merge requests when all discussions
+are resolved, there will be an **open an issue to resolve them later** link in
+the merge request-widget.
-![Open new issue from unresolved discussions](img/resolve_discussion_open_issue.png)
+![Link in merge request widget](img/resolve_discussion_open_issue.png)
This will prepare an issue with content referring to the merge request and
discussions.