diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:09:13 +0000 |
| commit | 211a8c3361ccf4eb92f36edbdcf15c98fcdcc8b7 (patch) | |
| tree | 0ad37172721a39b0d57240bb1b4e70f200a0d93e /.gitlab | |
| parent | 456a7247f9e88fc2518b69a1a00e905c6db6d775 (diff) | |
| download | gitlab-ce-211a8c3361ccf4eb92f36edbdcf15c98fcdcc8b7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 3fe8411ccad..03685d1f6a8 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -102,13 +102,13 @@ rspec migration pg9: extends: - .rspec-base-pg9 - .rspec-base-migration - parallel: 4 + parallel: 5 rspec migration pg9-foss: extends: - .rspec-base-pg9-foss - .rspec-base-migration - parallel: 4 + parallel: 5 rspec unit pg9: extends: .rspec-base-pg9 @@ -120,11 +120,11 @@ rspec unit pg9-foss: rspec integration pg9: extends: .rspec-base-pg9 - parallel: 6 + parallel: 8 rspec integration pg9-foss: extends: .rspec-base-pg9-foss - parallel: 6 + parallel: 8 rspec system pg9: extends: .rspec-base-pg9 @@ -140,7 +140,7 @@ rspec unit pg10: rspec integration pg10: extends: .rspec-base-pg10 - parallel: 6 + parallel: 8 rspec system pg10: extends: .rspec-base-pg10 @@ -170,11 +170,11 @@ rspec-ee unit pg9: rspec-ee integration pg9: extends: .rspec-ee-base-pg9 - parallel: 3 + parallel: 4 rspec-ee system pg9: extends: .rspec-ee-base-pg9 - parallel: 5 + parallel: 6 rspec-ee migration pg10: extends: |