diff options
Diffstat (limited to 'lib/gitlab/ci/yaml_processor')
| -rw-r--r-- | lib/gitlab/ci/yaml_processor/dag.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/yaml_processor/result.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/yaml_processor/dag.rb b/lib/gitlab/ci/yaml_processor/dag.rb index 0140218d9bc..8ab9573dd20 100644 --- a/lib/gitlab/ci/yaml_processor/dag.rb +++ b/lib/gitlab/ci/yaml_processor/dag.rb @@ -23,7 +23,7 @@ module Gitlab new(nodes).tsort rescue TSort::Cyclic - raise ValidationError, 'The pipeline has circular dependencies.' + raise ValidationError, 'The pipeline has circular dependencies' rescue MissingNodeError end diff --git a/lib/gitlab/ci/yaml_processor/result.rb b/lib/gitlab/ci/yaml_processor/result.rb index dd5107bad9a..a97c7050fbb 100644 --- a/lib/gitlab/ci/yaml_processor/result.rb +++ b/lib/gitlab/ci/yaml_processor/result.rb @@ -69,7 +69,7 @@ module Gitlab when: job[:when] || 'on_success', environment: job[:environment_name], coverage_regex: job[:coverage], - yaml_variables: transform_to_yaml_variables(job[:variables]), # https://gitlab.com/gitlab-org/gitlab/-/issues/300581 + # yaml_variables is calculated with using job_variables in Seed::Build job_variables: transform_to_yaml_variables(job[:job_variables]), root_variables_inheritance: job[:root_variables_inheritance], needs_attributes: job.dig(:needs, :job), |