summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-14 15:45:29 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-14 15:45:29 +0200
commit5923741fe690a688591ad36da894b3103954a437 (patch)
tree0033a82df7daf9a0fb5760531a878278dfeb53a0 /lib
parent3e16b015b969a4d5d28240e76bffd382b0772f49 (diff)
downloadgitlab-ce-5923741fe690a688591ad36da894b3103954a437.tar.gz
Remove references to global entry in new CI config
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/config/node/entry.rb2
-rw-r--r--lib/gitlab/ci/config/node/factory.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index c95e85200d2..9640103ea22 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -9,7 +9,7 @@ module Gitlab
class InvalidError < StandardError; end
attr_reader :config, :attributes
- attr_accessor :key, :parent, :global, :description
+ attr_accessor :key, :parent, :description
def initialize(config, **attributes)
@config = config
diff --git a/lib/gitlab/ci/config/node/factory.rb b/lib/gitlab/ci/config/node/factory.rb
index 339548e0feb..b509c5edf59 100644
--- a/lib/gitlab/ci/config/node/factory.rb
+++ b/lib/gitlab/ci/config/node/factory.rb
@@ -63,7 +63,6 @@ module Gitlab
node.new(value).tap do |entry|
entry.key = @attributes[:key]
entry.parent = @attributes[:parent] || @parent
- entry.global = @attributes[:global] || @parent.global
entry.description = @attributes[:description]
end
end