From 1b624ba4eb423c39671b9f0440018e9783aa844b Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon <grzesiek.bizon@gmail.com> Date: Fri, 8 Jul 2016 13:36:01 +0200 Subject: [PATCH] Improve name of CI entry validation context hook --- lib/gitlab/ci/config/node/entry.rb | 2 +- lib/gitlab/ci/config/node/jobs.rb | 2 +- lib/gitlab/ci/config/node/stage.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb index 67e59ffb86e..2b16a81f88d 100644 --- a/lib/gitlab/ci/config/node/entry.rb +++ b/lib/gitlab/ci/config/node/entry.rb @@ -34,7 +34,7 @@ module Gitlab end def validate! - @validator.validate(:after) + @validator.validate(:processed) @entries.each_value(&:validate!) end diff --git a/lib/gitlab/ci/config/node/jobs.rb b/lib/gitlab/ci/config/node/jobs.rb index 6199749a508..f6acc25e4fb 100644 --- a/lib/gitlab/ci/config/node/jobs.rb +++ b/lib/gitlab/ci/config/node/jobs.rb @@ -10,7 +10,7 @@ module Gitlab validations do validates :config, type: Hash - validate :jobs_presence, on: :after + validate :jobs_presence, on: :processed def jobs_presence unless relevant? diff --git a/lib/gitlab/ci/config/node/stage.rb b/lib/gitlab/ci/config/node/stage.rb index 457f6dfa3ba..c15f46bc7a5 100644 --- a/lib/gitlab/ci/config/node/stage.rb +++ b/lib/gitlab/ci/config/node/stage.rb @@ -11,7 +11,7 @@ module Gitlab validations do validates :config, key: true validates :global, required_attribute: true - validate :known_stage, on: :after + validate :known_stage, on: :processed def known_stage unless known? -- GitLab