diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
| commit | 123c68a7cf788ace140e57e478a12c5b7ac893ae (patch) | |
| tree | b36e565ecd895ee46c1713f3734308cfce0e6ba9 /lib/gitlab/ci/yaml_processor.rb | |
| parent | 862d225ca0d8eb452e56b8fe5a0109aac796e872 (diff) | |
| download | gitlab-ce-123c68a7cf788ace140e57e478a12c5b7ac893ae.tar.gz | |
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, 0 insertions, 1 deletions
diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index 7f3f518dfd7..8ac864eb5cf 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -64,7 +64,6 @@ module Gitlab except: job[:except], rules: job[:rules], cache: job[:cache], - resource_group_key: job[:resource_group], options: { image: job[:image], services: job[:services], |