From 20ccd4465b0fbba45839256af93cf36c7b45d4e9 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 9 Jun 2016 12:35:24 +0200
Subject: [PATCH] Do not require Ci config node to have a hash value
---
lib/gitlab/ci/config/node/configurable.rb | 8 ++++++++
lib/gitlab/ci/config/node/entry.rb | 4 ----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb
index 4b33fe025bb..e0a0b40fc60 100644
--- a/lib/gitlab/ci/config/node/configurable.rb
+++ b/lib/gitlab/ci/config/node/configurable.rb
@@ -5,6 +5,14 @@ module Gitlab
module Configurable
extend ActiveSupport::Concern
+ def initialize(*)
+ super
+
+ unless leaf? || has_config?
+ @errors << 'should be a configuration entry with hash value'
+ end
+ end
+
def keys
self.class.nodes || {}
end
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index bbe07d68b36..6b59461a585 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -13,10 +13,6 @@ module Gitlab
@parent = parent
@nodes = {}
@errors = []
-
- unless leaf? || has_config?
- @errors << 'should be a configuration entry with hash value'
- end
end
def process!
--
GitLab