summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/config/entry/job.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 12:06:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 12:06:26 +0000
commitdeed6022efe0149d88c57ef1df736c83465643f9 (patch)
tree4cf4c7c1ce765e83547129607b6bd3881c0fad6b /lib/gitlab/ci/config/entry/job.rb
parentf7a13c56bf0ed7ff9591bf4cbf9e50487255c4bc (diff)
downloadgitlab-ce-deed6022efe0149d88c57ef1df736c83465643f9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/config/entry/job.rb')
-rw-r--r--lib/gitlab/ci/config/entry/job.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 2d5981a4255..1298e2d3462 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -50,6 +50,7 @@ module Gitlab
validates :timeout, duration: { limit: ChronicDuration.output(Project::MAX_BUILD_TIMEOUT) }
validates :dependencies, array_of_strings: true
+ validates :needs, array_of_strings: true
validates :extends, array_of_strings_or_string: true
validates :rules, array_of_hashes: true
end
@@ -113,11 +114,6 @@ module Gitlab
description: 'List of evaluable Rules to determine job inclusion.',
inherit: false
- entry :needs, Entry::Needs,
- description: 'Needs configuration for this job.',
- metadata: { allowed_needs: %i[job] },
- inherit: false
-
entry :variables, Entry::Variables,
description: 'Environment variables available for this job.',
inherit: false