diff options
author | Rémy Coutable <remy@rymai.me> | 2018-01-04 11:00:33 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-04 11:00:33 +0000 |
commit | 0eaa3c552e66a3153dd04b4b6422ff87d08fcd24 (patch) | |
tree | 19b2f395e03c59f062e709c72cd19f918685c106 | |
parent | 062ea80e649ae516f26db55c6e3b170523fdcd62 (diff) | |
parent | 55137e200d9f9f8cdbdadc96cf098a088873e3f1 (diff) | |
download | gitlab-ce-0eaa3c552e66a3153dd04b4b6422ff87d08fcd24.tar.gz |
Merge branch 'integration-tests' into 'master'
Include integration tests in CE/EE testing documentation
See merge request gitlab-org/gitlab-ce!16139
-rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 01d4a546b97..2b79f0825e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -553,7 +553,7 @@ the feature you contribute through all of these steps. 1. Description explaining the relevancy (see following item) 1. Working and clean code that is commented where needed -1. [Unit and system tests][testing] that pass on the CI server +1. [Unit, integration, and system tests][testing] that pass on the CI server 1. Performance/scalability implications have been considered, addressed, and tested 1. [Documented][doc-styleguide] in the `/doc` directory 1. [Changelog entry added][changelog], if necessary |