diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 09:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 09:09:05 +0300 |
| commit | 8c9dc985b90c353b33cb829caf51f8320171bc15 (patch) | |
| tree | 9a68886dbea1aefabddb46bbd3faf961eab22ae6 /lib/gitlab/ci/config/entry/job.rb | |
| parent | 500626a5c953ad81cfc3ed74bf0148c075617e58 (diff) | |
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.rb | 3 |
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 124581c961f..ffc8cb887e8 100644 --- a/lib/gitlab/ci/config/entry/job.rb +++ b/lib/gitlab/ci/config/entry/job.rb @@ -258,7 +258,8 @@ module Gitlab after_script: after_script_value, ignore: ignored?, needs: needs_defined? ? needs_value : nil, - resource_group: resource_group } + resource_group: resource_group, + scheduling_type: needs_defined? ? :dag : :stage } end end end |