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>2020-09-25 21:09:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-25 21:09:46 +0300
commite2c80979588d801d6def0dab9e3bf180ae91cf01 (patch)
tree2d4eaa832514aacc77c8f7c9c96931626129338e /lib/gitlab/ci/yaml_processor
parentf4fb4d59484318767d9e687b3123b70fa01854be (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.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/ci/yaml_processor/result.rb b/lib/gitlab/ci/yaml_processor/result.rb
index 68f61e52df7..6c771b220ad 100644
--- a/lib/gitlab/ci/yaml_processor/result.rb
+++ b/lib/gitlab/ci/yaml_processor/result.rb
@@ -95,6 +95,10 @@ module Gitlab
}.compact }.compact
end
+ def merged_yaml
+ @ci_config&.to_hash&.to_yaml
+ end
+
private
def variables