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/development | |
| parent | 03c307b6fa9f42e45c39dd5ef973b365ace9854e (diff) | |
| download | gitlab-ce-24a5fe6b1497308832329ff0c1f31b309b3b0f96.tar.gz | |
Rename "discussions" to "threads" in docs
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/code_review.md | 6 | ||||
| -rw-r--r-- | doc/development/contributing/issue_workflow.md | 4 | ||||
| -rw-r--r-- | doc/development/contributing/merge_request_workflow.md | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md index e60800f1ab7..35ce6b8cbe4 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -207,9 +207,9 @@ first time. - Extract unrelated changes and refactorings into future merge requests/issues. - Seek to understand the reviewer's perspective. - Try to respond to every comment. -- The merge request author resolves only the discussions they have fully - addressed. If there's an open reply, an open discussion, a suggestion, - a question, or anything else, the discussion should be left to be resolved +- The merge request author resolves only the threads they have fully + addressed. If there's an open reply, an open thread, a suggestion, + a question, or anything else, the thread should be left to be resolved by the reviewer. - Push commits based on earlier rounds of feedback as isolated commits to the branch. Do not squash until the branch is ready to merge. Reviewers should be diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index d0562cd2bbd..abe11b8d1a8 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -248,8 +248,8 @@ If a bug seems to fall between two severity labels, assign it to the higher-seve - Example(s) of ~S1 - Data corruption/loss. - Security breach. - - Unable to create an issue or merge request. - - Unable to add a comment or discussion to the issue or merge request. + - Unable to create an issue or merge request. + - Unable to add a comment or thread to the issue or merge request. - Example(s) of ~S2 - Cannot submit changes through the web IDE but the commandline works. - A status widget on the merge request page is not working but information can be seen in the test pipeline page. diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md index 3f61ad7cb13..3325d3e074e 100644 --- a/doc/development/contributing/merge_request_workflow.md +++ b/doc/development/contributing/merge_request_workflow.md @@ -74,10 +74,10 @@ request is as follows: can be found by running `grep css-class ./app -R`. 1. Be prepared to answer questions and incorporate feedback into your MR with new commits. Once you have fully addressed a suggestion from a reviewer, click the - "Resolve discussion" button beneath it to mark it resolved. - 1. The merge request author resolves only the discussions they have fully addressed. - If there's an open reply or discussion, a suggestion, a question, or anything else, - the discussion should be left to be resolved by the reviewer. + "Resolve thread" button beneath it to mark it resolved. + 1. The merge request author resolves only the threads they have fully addressed. + If there's an open reply or thread, a suggestion, a question, or anything else, + the thread should be left to be resolved by the reviewer. 1. If your MR touches code that executes shell commands, reads or opens files, or handles paths to files on disk, make sure it adheres to the [shell command guidelines](../shell_commands.md) |