summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-08-25 13:58:46 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-08-25 13:58:46 +0200
commit4f837f6690970bde315b8c9d76190ed45f15e49e (patch)
treececa4e97b437b4b0fe3d75fc9ea38979c8fac20c /lib
parenteaf211c2e393a2eeb5999b9ffec17112cdd52a0c (diff)
downloadgitlab-ce-4f837f6690970bde315b8c9d76190ed45f15e49e.tar.gz
Remove temporary stub method from ci config nodes
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/config/node/configurable.rb2
-rw-r--r--lib/gitlab/ci/config/node/entry.rb6
-rw-r--r--lib/gitlab/ci/config/node/job.rb2
3 files changed, 2 insertions, 8 deletions
diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb
index 530f95a6251..6b7ab2fdaf2 100644
--- a/lib/gitlab/ci/config/node/configurable.rb
+++ b/lib/gitlab/ci/config/node/configurable.rb
@@ -23,7 +23,7 @@ module Gitlab
end
end
- def compose!(deps)
+ def compose!(deps = nil)
return unless valid?
self.class.nodes.each do |key, factory|
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index e02f4bf0a05..907d25a8c49 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -20,12 +20,6 @@ module Gitlab
@validator.validate(:new)
end
- # Temporary method
- #
- def process!(deps = nil)
- compose!(deps)
- end
-
def compose!(deps = nil)
return unless valid?
diff --git a/lib/gitlab/ci/config/node/job.rb b/lib/gitlab/ci/config/node/job.rb
index 9317bb40f50..3e6666d751f 100644
--- a/lib/gitlab/ci/config/node/job.rb
+++ b/lib/gitlab/ci/config/node/job.rb
@@ -82,7 +82,7 @@ module Gitlab
:cache, :image, :services, :only, :except, :variables,
:artifacts
- def compose!(deps)
+ def compose!(deps = nil)
super do
if type_defined? && !stage_defined?
@entries[:stage] = @entries[:type]