From b85d4969a973862414560bd23b5ff4192dfaa372 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 29 Jun 2016 10:02:02 +0200
Subject: [PATCH] Return compound value if CI config node is composite
---
lib/gitlab/ci/config/node/entry.rb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index 985d1705191..8fece12232b 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -47,7 +47,12 @@ module Gitlab
end
def value
- @config
+ if leaf?
+ @config
+ else
+ defined = @nodes.select { |_key, value| value.defined? }
+ Hash[(defined).map { |key, node| [key, node.value] }]
+ end
end
def defined?
--
GitLab