diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-25 11:39:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-25 11:39:21 +0300 |
| commit | b6af009a3e28b4c8b06a4919051d02bb44aba84f (patch) | |
| tree | 8ceeb07c1aaccf2d9f196955bb7e8ae52c2f1ddf /doc/development | |
| parent | 24244d03b55bc7732b3362bab1e1cc7e04c2dabf (diff) | |
| parent | 9f7f78570f4dba345a71b6d14a08d0430fad8304 (diff) | |
Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'
Reenable MySQL tests on all CE and EE branches
Closes #36384
See merge request !13812
Diffstat (limited to 'doc/development')
| -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. |