diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-31 16:00:42 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-03 18:11:06 +0100 |
| commit | 0d5fa4cfb7afba659b0110d6b8ace7300a1055df (patch) | |
| tree | 602dcb59874a22b2179f0c6366a6d9eef1ffbc7c | |
| parent | 7808df6d65f2140779b889a813e811e7fa2e2f3b (diff) | |
| download | gitlab-ce-20968-add-setting-to-check-unresolved-discussion.tar.gz | |
Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature20968-add-setting-to-check-unresolved-discussion
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved.png | bin | 0 -> 24693 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved_msg.png | bin | 0 -> 6940 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/merge_request_discussion_resolution.md | 18 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/merge_when_build_succeeds.md | 4 |
4 files changed, 20 insertions, 2 deletions
diff --git a/doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved.png b/doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved.png Binary files differnew file mode 100644 index 00000000000..52c8acf15e0 --- /dev/null +++ b/doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved.png diff --git a/doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved_msg.png b/doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved_msg.png Binary files differnew file mode 100644 index 00000000000..79ba5c362c7 --- /dev/null +++ b/doc/user/project/merge_requests/img/only_allow_merge_if_all_discussions_are_resolved_msg.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 2559f5f5250..285b1798ac5 100644 --- a/doc/user/project/merge_requests/merge_request_discussion_resolution.md +++ b/doc/user/project/merge_requests/merge_request_discussion_resolution.md @@ -33,7 +33,25 @@ resolved discussions tracker. !["3/4 discussions resolved"][discussions-resolved] +## Only allow merge requests to be merged if all discussions are resolved + +> [Introduced][ce-7125] in GitLab 8.14. + +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 +box and hit **Save** for the changes to take effect. + + + +From now on, you will not be able to merge from the UI until all discussions +are resolved. + + + [ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022 +[ce-7125]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7125 [resolve-discussion-button]: img/resolve_discussion_button.png [resolve-comment-button]: img/resolve_comment_button.png [discussion-view]: img/discussion_view.png diff --git a/doc/user/project/merge_requests/merge_when_build_succeeds.md b/doc/user/project/merge_requests/merge_when_build_succeeds.md index c138061fd40..d4e5b5de685 100644 --- a/doc/user/project/merge_requests/merge_when_build_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_build_succeeds.md @@ -40,7 +40,7 @@ hit **Save** for the changes to take effect.  -From now on, every time the pipelinefails you will not be able to merge the +From now on, every time the pipeline fails you will not be able to merge the merge request from the UI, until you make all relevant builds pass. - + |
