diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-28 15:29:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-28 15:29:21 +0300 |
| commit | 7dbb86783d785d4ba2b5cf97eb88653fd9197e3c (patch) | |
| tree | 3c2ec763467c4451c4e5f4a6b139f5ff6f6c4b9e /doc | |
| parent | 0b73771205a2f967055c9701ff92f70289a1af23 (diff) | |
| parent | c199535d13f7ad20e0ff92e1c24e174cdf38d569 (diff) | |
Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'
Reenable MySQL tests on all CE and EE branches part 2
Closes #36384
See merge request !13840
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/testing.md | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/development/testing.md b/doc/development/testing.md index efd56484b12..83269303005 100644 --- a/doc/development/testing.md +++ b/doc/development/testing.md @@ -529,10 +529,7 @@ slowest test files and try to improve them. ## CI setup -- On CE, the test suite only runs against PostgreSQL by default. We additionally - run the suite against MySQL for tags, `master`, and any branch that includes - `mysql` in the name. -- On EE, the test suite always runs both PostgreSQL and MySQL. +- On CE and EE, the test suite runs both PostgreSQL and MySQL. - Rails logging to `log/test.log` is disabled by default in CI [for performance reasons][logging]. To override this setting, provide the `RAILS_ENABLE_TEST_LOG` environment variable. |