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/yaml_processor.rb | |
| parent | 500626a5c953ad81cfc3ed74bf0148c075617e58 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/yaml_processor.rb')
| -rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index 080a8ac107d..ae3ff4a51e2 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -65,6 +65,7 @@ module Gitlab rules: job[:rules], cache: job[:cache], resource_group_key: job[:resource_group], + scheduling_type: job[:scheduling_type], options: { image: job[:image], services: job[:services], |