diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-09 23:42:24 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-09 23:42:24 +0000 |
| commit | e5f4f1d19064800f3b3b11223c62ed5dcffc72b4 (patch) | |
| tree | ffc93e51d90573e375a1a6ec407c5449ad1466e5 | |
| parent | 57f7a4db63ccddfb8a684af43876267859f7ff0e (diff) | |
| parent | b4b9df277bb1490ba04a976fb2a59f2a0f603173 (diff) | |
| download | gitlab-ce-e5f4f1d19064800f3b3b11223c62ed5dcffc72b4.tar.gz | |
Merge branch 'yaml_safe_load' into 'master'
Use YAML.safe_load
See merge request !1941
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index 3beafcad117..e7fb1b79b7c 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -10,7 +10,7 @@ module Ci attr_reader :before_script, :image, :services, :variables, :path, :cache def initialize(config, path = nil) - @config = YAML.load(config) + @config = YAML.safe_load(config, [Symbol]) @path = path unless @config.is_a? Hash |