From a9bd16bd0a44332133d0f9fd859d9ffaba9e262f Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon <grzesiek.bizon@gmail.com> Date: Fri, 17 Jun 2016 11:55:55 +0200 Subject: [PATCH] Rename legacy validation helpers for new ci config --- lib/ci/gitlab_ci_yaml_processor.rb | 2 +- .../{validation_helpers.rb => legacy_validation_helpers.rb} | 2 +- lib/gitlab/ci/config/node/script.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename lib/gitlab/ci/config/node/{validation_helpers.rb => legacy_validation_helpers.rb} (95%) diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index e0b89cead06..1a5be9dbc46 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -2,7 +2,7 @@ module Ci class GitlabCiYamlProcessor class ValidationError < StandardError; end - include Gitlab::Ci::Config::Node::ValidationHelpers + include Gitlab::Ci::Config::Node::LegacyValidationHelpers DEFAULT_STAGES = %w(build test deploy) DEFAULT_STAGE = 'test' diff --git a/lib/gitlab/ci/config/node/validation_helpers.rb b/lib/gitlab/ci/config/node/legacy_validation_helpers.rb similarity index 95% rename from lib/gitlab/ci/config/node/validation_helpers.rb rename to lib/gitlab/ci/config/node/legacy_validation_helpers.rb index 42ef60244ba..970763670c5 100644 --- a/lib/gitlab/ci/config/node/validation_helpers.rb +++ b/lib/gitlab/ci/config/node/legacy_validation_helpers.rb @@ -2,7 +2,7 @@ module Gitlab module Ci class Config module Node - module ValidationHelpers + module LegacyValidationHelpers private def validate_duration(value) diff --git a/lib/gitlab/ci/config/node/script.rb b/lib/gitlab/ci/config/node/script.rb index 059650d8a52..44490096f28 100644 --- a/lib/gitlab/ci/config/node/script.rb +++ b/lib/gitlab/ci/config/node/script.rb @@ -14,7 +14,7 @@ module Gitlab include Validatable validations do - include ValidationHelpers + include LegacyValidationHelpers validate :array_of_strings -- GitLab