diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-10 10:49:47 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-10 10:49:47 +0200 |
commit | 828a15bccd5a6fe0471e97ebd5c0c0f6f674b9b7 (patch) | |
tree | d30e899d06b133359cfadab971fb7d281e0cfce9 /lib | |
parent | 51046dd22628cc54e92ca6da016c05762158e8ea (diff) | |
download | gitlab-ce-828a15bccd5a6fe0471e97ebd5c0c0f6f674b9b7.tar.gz |
Rename method used to allow node in Ci config
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/config/node/configurable.rb | 8 | ||||
-rw-r--r-- | lib/gitlab/ci/config/node/global.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb index cf065c7f6fe..c8c917f229f 100644 --- a/lib/gitlab/ci/config/node/configurable.rb +++ b/lib/gitlab/ci/config/node/configurable.rb @@ -25,7 +25,7 @@ module Gitlab end def allowed_nodes - self.class.nodes || {} + self.class.allowed_nodes || {} end private @@ -46,16 +46,16 @@ module Gitlab end class_methods do - attr_reader :nodes + attr_reader :allowed_nodes private - def add_node(symbol, entry_class, metadata) + def allow_node(symbol, entry_class, metadata) node = { symbol.to_sym => { class: entry_class, description: metadata[:description] } } - (@nodes ||= {}).merge!(node) + (@allowed_nodes ||= {}).merge!(node) end end end diff --git a/lib/gitlab/ci/config/node/global.rb b/lib/gitlab/ci/config/node/global.rb index 911dc51da48..044603423d5 100644 --- a/lib/gitlab/ci/config/node/global.rb +++ b/lib/gitlab/ci/config/node/global.rb @@ -9,7 +9,7 @@ module Gitlab class Global < Entry include Configurable - add_node :before_script, Script, + allow_node :before_script, Script, description: 'Script that will be executed before each job.' end end |