summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/config/entry/image.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-11-30 12:52:04 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-11-30 12:52:04 +0100
commit5df4ba0a93fd266105ccf35fd49fa18e6403c15b (patch)
tree57d32dbd0af5d54643060faba9ab6ba993357a1f /lib/gitlab/ci/config/entry/image.rb
parent1486950bc9396f9b8384763d68f36387326eb745 (diff)
parentfeece7713247a063bfa71ab701f8a164e6fa71bb (diff)
downloadgitlab-ce-5df4ba0a93fd266105ccf35fd49fa18e6403c15b.tar.gz
Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-class
* master: (1794 commits)
Diffstat (limited to 'lib/gitlab/ci/config/entry/image.rb')
-rw-r--r--lib/gitlab/ci/config/entry/image.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/ci/config/entry/image.rb b/lib/gitlab/ci/config/entry/image.rb
index 6555c589173..2844be80a84 100644
--- a/lib/gitlab/ci/config/entry/image.rb
+++ b/lib/gitlab/ci/config/entry/image.rb
@@ -37,6 +37,7 @@ module Gitlab
def value
return { name: @config } if string?
return @config if hash?
+
{}
end
end