diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-03-07 15:59:00 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-03-07 15:59:00 +0000 |
| commit | dbd7309a16bd3abc6c586b6c2df2beb317cfef95 (patch) | |
| tree | 3fdd719c926ac80285f0dc93ef975625657d0fbb /doc/development/contributing | |
| parent | 7be248334b350091e83d0335bf0c263071c6a67f (diff) | |
| parent | b63efb09a5c864047924cd2d84527b47dd563d5f (diff) | |
| download | gitlab-ce-reply-to-comment-documentation.tar.gz | |
Merge branch 'master' into 'reply-to-comment-documentation'reply-to-comment-documentation
# Conflicts:
# doc/user/discussions/index.md
Diffstat (limited to 'doc/development/contributing')
| -rw-r--r-- | doc/development/contributing/merge_request_workflow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md index 4e766f37871..8b14c3b20ea 100644 --- a/doc/development/contributing/merge_request_workflow.md +++ b/doc/development/contributing/merge_request_workflow.md @@ -179,7 +179,7 @@ the feature you contribute through all of these steps. 1. Added to [the website](https://gitlab.com/gitlab-com/www-gitlab-com/), if relevant 1. Community questions answered 1. Answers to questions radiated (in docs/wiki/support etc.) -1. [Black-box tests/end-to-end tests](../testing_guide/testing_levels.md#black-box-tests-or-end-to-end-tests) added if required. Please contact [the quality team](https://about.gitlab.com/handbook/engineering/quality/#teams) with any questions +1. [Black-box tests/end-to-end tests](../testing_guide/testing_levels.md#black-box-tests-at-the-system-level-aka-end-to-end-tests) added if required. Please contact [the quality team](https://about.gitlab.com/handbook/engineering/quality/#teams) with any questions If you add a dependency in GitLab (such as an operating system package) please consider updating the following and note the applicability of each in your |