summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-03 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-03 09:08:42 +0000
commitf14507e586a7f75f0fb71a1d8468b7361be860d4 (patch)
treea8aa547b517a7ae5626c902bfb558c1fc5386c4e /.gitlab
parentf4d27d532e3abeecd1caffeb3a56e698ae982e5b (diff)
downloadgitlab-ce-f14507e586a7f75f0fb71a1d8468b7361be860d4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 8c3df170f6d..6b0a7f31f1a 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -165,7 +165,7 @@ rspec-ee migration pg9:
rspec-ee unit pg9:
extends: .rspec-ee-base-pg9
- parallel: 5
+ parallel: 10
rspec-ee integration pg9:
extends: .rspec-ee-base-pg9
@@ -186,7 +186,7 @@ rspec-ee unit pg10:
extends:
- .rspec-ee-base-pg10
- .only-master
- parallel: 5
+ parallel: 10
rspec-ee integration pg10:
extends: