summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-09 12:35:24 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-09 12:35:24 +0200
commit20ccd4465b0fbba45839256af93cf36c7b45d4e9 (patch)
tree56b97cfcc81217d29d75f30aabec757723a78f6e /lib/gitlab/ci
parent6a319fd28790228295de19d8c786d1a807f73376 (diff)
downloadgitlab-ce-20ccd4465b0fbba45839256af93cf36c7b45d4e9.tar.gz
Do not require Ci config node to have a hash value
Diffstat (limited to 'lib/gitlab/ci')
-rw-r--r--lib/gitlab/ci/config/node/configurable.rb8
-rw-r--r--lib/gitlab/ci/config/node/entry.rb4
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!