diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-22 17:18:18 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-22 17:18:18 +0000 |
| commit | b92d5135d8522e1370636799d74b51f9a37d0b2f (patch) | |
| tree | 7925cb3efebdbe8c7053f3e3757edade37f52371 /lib | |
| parent | d60b09d9312cd42e2c0ab784cc0b9d92b4d4f5c6 (diff) | |
| parent | 0711d9adfc9e402c7763ce1ce914bc672165eb90 (diff) | |
| download | gitlab-ce-b92d5135d8522e1370636799d74b51f9a37d0b2f.tar.gz | |
Merge branch 'fix-old-ci-api' into 'master'
Fix support for old CI API when image or services are not specified
Closes #35421
See merge request !13023
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ci/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb index 6b82b2b4f13..31f66dd5a58 100644 --- a/lib/ci/api/entities.rb +++ b/lib/ci/api/entities.rb @@ -52,7 +52,7 @@ module Ci # when old API will be removed (planned for August 2017). model.options.dup.tap do |options| options[:image] = options[:image][:name] if options[:image].is_a?(Hash) - options[:services].map! do |service| + options[:services]&.map! do |service| if service.is_a?(Hash) service[:name] else |