diff options
| author | Michel Engelen <michel@nomorejs.net> | 2019-07-15 06:10:32 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-07-15 06:10:32 +0000 |
| commit | 24a5fe6b1497308832329ff0c1f31b309b3b0f96 (patch) | |
| tree | e7dc851236f298f68c2fa383ec954b0c43064c5c /doc/user/project/merge_requests/merge_request_approvals.md | |
| parent | 03c307b6fa9f42e45c39dd5ef973b365ace9854e (diff) | |
| download | gitlab-ce-24a5fe6b1497308832329ff0c1f31b309b3b0f96.tar.gz | |
Rename "discussions" to "threads" in docs
Diffstat (limited to 'doc/user/project/merge_requests/merge_request_approvals.md')
| -rw-r--r-- | doc/user/project/merge_requests/merge_request_approvals.md | 2 |
1 files changed, 1 insertions, 1 deletions
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)** |