From 24a5fe6b1497308832329ff0c1f31b309b3b0f96 Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Mon, 15 Jul 2019 06:10:32 +0000 Subject: Rename "discussions" to "threads" in docs --- doc/user/project/merge_requests/merge_request_approvals.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/user/project/merge_requests/merge_request_approvals.md') diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md index 0f392676316..220795d6f15 100644 --- a/doc/user/project/merge_requests/merge_request_approvals.md +++ b/doc/user/project/merge_requests/merge_request_approvals.md @@ -162,7 +162,7 @@ the merge request is unblocked and can be merged. Note, that meeting the required number of approvals is a necessary, but not sufficient condition for unblocking a merge request from being merged. There are other conditions that may block it, such as merge conflicts, -[pending discussions](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved) +[pending discussions](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved) or a [failed CI/CD pipeline](merge_when_pipeline_succeeds.md). ## Code Owners approvals **(PREMIUM)** -- cgit v1.2.1