diff options
Diffstat (limited to 'lib/gitlab/ci/yaml_processor.rb')
| -rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index c94fa84f608..1aa3dbc5e47 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -47,9 +47,7 @@ module Gitlab validate_job!(name, job) end - if ::Feature.enabled?(:ci_same_stage_job_needs, @opts[:project], default_enabled: :yaml) - YamlProcessor::Dag.check_circular_dependencies!(@jobs) - end + YamlProcessor::Dag.check_circular_dependencies!(@jobs) end def validate_job!(name, job) @@ -103,16 +101,8 @@ module Gitlab job_stage_index = stage_index(name) dependency_stage_index = stage_index(dependency) - if ::Feature.enabled?(:ci_same_stage_job_needs, @opts[:project], default_enabled: :yaml) - unless dependency_stage_index.present? && dependency_stage_index <= job_stage_index - error!("#{name} job: #{dependency_type} #{dependency} is not defined in current or prior stages") - end - else - # A dependency might be defined later in the configuration - # with a stage that does not exist - unless dependency_stage_index.present? && dependency_stage_index < job_stage_index - error!("#{name} job: #{dependency_type} #{dependency} is not defined in prior stages") - end + unless dependency_stage_index.present? && dependency_stage_index <= job_stage_index + error!("#{name} job: #{dependency_type} #{dependency} is not defined in current or prior stages") end end |