diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-09 23:42:24 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-09 18:43:44 -0500 |
| commit | 9888a9725b5275962992d179b5deb27f7d9cadb2 (patch) | |
| tree | 5d9e64838cae48913594f2034cca671fd1819976 | |
| parent | 0ece3d65520b1b610d5c9a1cd517d7ed5f3b9821 (diff) | |
| download | gitlab-ce-9888a9725b5275962992d179b5deb27f7d9cadb2.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 |