Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-22 18:10:04 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-22 18:10:04 +0300
commit632d0734750382e7c4e5f1b3c526a94acf6e7ce2 (patch)
tree7f212ce25ff1d0d4ea03f48ad6dedb09c9ad09eb /lib/gitlab/ci/yaml_processor
parent74b99c4264411703dedaf2d24cec2e6a5de6337d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/yaml_processor')
-rw-r--r--lib/gitlab/ci/yaml_processor/result.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ci/yaml_processor/result.rb b/lib/gitlab/ci/yaml_processor/result.rb
index 576fb509d47..4bd1ac3b67f 100644
--- a/lib/gitlab/ci/yaml_processor/result.rb
+++ b/lib/gitlab/ci/yaml_processor/result.rb
@@ -39,7 +39,7 @@ module Gitlab
end
def workflow_rules
- @workflow_rules ||= hash_config.dig(:workflow, :rules)
+ @workflow_rules ||= @ci_config.workflow_rules
end
def root_variables
@@ -133,10 +133,6 @@ module Gitlab
@variables ||= @ci_config.variables
end
- def hash_config
- @hash_config ||= @ci_config.to_hash
- end
-
def release(job)
job[:release]
end