Automatic merge of gitlab-org/gitlab-ce master

751dd11f · GitLab Bot · 55c46a9b · 688f47ee · 751dd11f
Commit 751dd11f authored Jul 06, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitlab/ci/rails.gitlab-ci.yml .gitlab/ci/rails.gitlab-ci.yml +2 -2

No files found.
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -139,7 +139,7 @@ setup-test-env:

 rspec unit pg:
  <<: *rspec-metadata-pg
-  parallel: 25
+  parallel: 20

 rspec integration pg:
  <<: *rspec-metadata-pg
@@ -152,7 +152,7 @@ rspec system pg:
 rspec unit pg-10:
  <<: *rspec-metadata-pg-10
  <<: *only-schedules-master
-  parallel: 25
+  parallel: 20

 rspec integration pg-10:
  <<: *rspec-metadata-pg-10