diff options
| author | DJ Mountney <dj@gitlab.com> | 2019-06-28 19:27:39 +0300 |
|---|---|---|
| committer | DJ Mountney <dj@gitlab.com> | 2019-06-28 19:27:39 +0300 |
| commit | c1b1a1fb5e648d44286e6312daa9fa7980202914 (patch) | |
| tree | 152b36c6bdd8384cc2c842d787f9058bee6bb67c /.gitlab/ci | |
| parent | de93bf1fbbd091075ef7ebafb2ab9dabc2e6563c (diff) | |
| parent | 1cd8fb49f9b9150faf50767edbdfb564fde8576b (diff) | |
Merge branch 'master' into 'check-min-schema-migrate'
# Conflicts:
# lib/gitlab/database.rb
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 2cd40f84ec7..9dcc9479cca 100644 --- 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: 20 + parallel: 25 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: 20 + parallel: 25 rspec integration pg-10: <<: *rspec-metadata-pg-10 |