From 48a59c1a8baf3921f26c8503a9fdd63bf7398f0f Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 8 Jun 2016 13:22:39 +0200 Subject: Rename BeforeScript to Script in new Ci config --- lib/gitlab/ci/config/node/before_script.rb | 25 ------------------------- lib/gitlab/ci/config/node/global.rb | 2 +- lib/gitlab/ci/config/node/script.rb | 25 +++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 lib/gitlab/ci/config/node/before_script.rb create mode 100644 lib/gitlab/ci/config/node/script.rb (limited to 'lib') diff --git a/lib/gitlab/ci/config/node/before_script.rb b/lib/gitlab/ci/config/node/before_script.rb deleted file mode 100644 index be2ceebf3f9..00000000000 --- a/lib/gitlab/ci/config/node/before_script.rb +++ /dev/null @@ -1,25 +0,0 @@ -module Gitlab - module Ci - class Config - module Node - class BeforeScript < Entry - include ValidationHelpers - - def description - 'Script that is executed before the one defined in a job.' - end - - def value - @value.join("\n") - end - - def validate! - unless validate_array_of_strings(@value) - @errors << 'before_script should be an array of strings' - end - end - end - end - end - end -end diff --git a/lib/gitlab/ci/config/node/global.rb b/lib/gitlab/ci/config/node/global.rb index cfa506c28b7..2e899b0b2a3 100644 --- a/lib/gitlab/ci/config/node/global.rb +++ b/lib/gitlab/ci/config/node/global.rb @@ -3,7 +3,7 @@ module Gitlab class Config module Node class Global < Entry - add_node :before_script, BeforeScript + add_node :before_script, Script end end end diff --git a/lib/gitlab/ci/config/node/script.rb b/lib/gitlab/ci/config/node/script.rb new file mode 100644 index 00000000000..db635f6541f --- /dev/null +++ b/lib/gitlab/ci/config/node/script.rb @@ -0,0 +1,25 @@ +module Gitlab + module Ci + class Config + module Node + class Script < Entry + include ValidationHelpers + + def description + 'Script that is executed before the one defined in a job.' + end + + def value + @value.join("\n") + end + + def validate! + unless validate_array_of_strings(@value) + @errors << 'before_script should be an array of strings' + end + end + end + end + end + end +end -- cgit v1.2.1