summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-11-08 13:24:37 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-11-08 13:24:37 +0000
commit2019d195a1528adfde6d962262a4781007a7cb66 (patch)
treed10bf6c655c260e9f13918758a2476590f1cd570 /lib
parent5b270431399ca14198d7684c1855de04ee8aec5e (diff)
parent036c9c58ba04046241a2183ec98ad84fcfd0a5bf (diff)
downloadgitlab-ce-2019d195a1528adfde6d962262a4781007a7cb66.tar.gz
Merge branch 'limit-parallel-to-100' into 'master'
Limit parallel to 50 Closes #53711 See merge request gitlab-org/gitlab-ce!22907
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/config/entry/job.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 8e8c979f973..c8cb3248fa7 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -27,7 +27,8 @@ module Gitlab
validates :tags, array_of_strings: true
validates :allow_failure, boolean: true
validates :parallel, numericality: { only_integer: true,
- greater_than_or_equal_to: 2 }
+ greater_than_or_equal_to: 2,
+ less_than_or_equal_to: 50 }
validates :when,
inclusion: { in: %w[on_success on_failure always manual delayed],
message: 'should be on_success, on_failure, ' \