From 97ec24f0b07d78dee1fa079479abc3b8ddf2e844 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 21 Jun 2016 13:12:58 +0200
Subject: [PATCH] Return CI entry config as value by default
---
lib/gitlab/ci/config/node/entry.rb | 5 +++--
lib/gitlab/ci/config/node/image.rb | 4 ----
lib/gitlab/ci/config/node/script.rb | 4 ----
lib/gitlab/ci/config/node/services.rb | 4 ----
4 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index f044ef965e9..91f3fd0e236 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -9,7 +9,8 @@ module Gitlab
class InvalidError < StandardError; end
attr_reader :config
- attr_accessor :key, :description
+ attr_accessor :description
+ attr_writer :key
def initialize(config)
@config = config
@@ -48,7 +49,7 @@ module Gitlab
end
def value
- raise NotImplementedError
+ @config
end
def self.nodes
diff --git a/lib/gitlab/ci/config/node/image.rb b/lib/gitlab/ci/config/node/image.rb
index ff8dd8308ad..5d3c7c5eab0 100644
--- a/lib/gitlab/ci/config/node/image.rb
+++ b/lib/gitlab/ci/config/node/image.rb
@@ -11,10 +11,6 @@ module Gitlab
validations do
validates :config, type: String
end
-
- def value
- @config
- end
end
end
end
diff --git a/lib/gitlab/ci/config/node/script.rb b/lib/gitlab/ci/config/node/script.rb
index 7bbd6291c2d..39328f0fade 100644
--- a/lib/gitlab/ci/config/node/script.rb
+++ b/lib/gitlab/ci/config/node/script.rb
@@ -11,10 +11,6 @@ module Gitlab
validations do
validates :config, array_of_strings: true
end
-
- def value
- @config
- end
end
end
end
diff --git a/lib/gitlab/ci/config/node/services.rb b/lib/gitlab/ci/config/node/services.rb
index d9898d9a4a1..481e2b66adc 100644
--- a/lib/gitlab/ci/config/node/services.rb
+++ b/lib/gitlab/ci/config/node/services.rb
@@ -11,10 +11,6 @@ module Gitlab
validations do
validates :config, array_of_strings: true
end
-
- def value
- @config
- end
end
end
end
--
GitLab