diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-03-11 14:22:49 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-03-11 14:22:49 +0100 |
| commit | 388f69b0de6450ec48a8b88df48bbe2d465593ea (patch) | |
| tree | 605a78c0546f20a86e63afe255a82c86f0148c7f /lib | |
| parent | 9a271d80128451eecc9a301d5e9924c09740be07 (diff) | |
| parent | 29ac9f64ea6d0a9e5a7615a9597c668dd129f5ae (diff) | |
| download | gitlab-ce-388f69b0de6450ec48a8b88df48bbe2d465593ea.tar.gz | |
Merge remote-tracking branch 'origin/master' into gitlab-ci-yaml-updates
# Conflicts:
# spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
Diffstat (limited to 'lib')
| -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 04b58cf1cd3..c89e1b51019 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -12,7 +12,7 @@ module Ci attr_reader :before_script, :image, :services, :variables, :path, :cache def initialize(config, path = nil) - @config = YAML.safe_load(config, [Symbol]) + @config = YAML.safe_load(config, [Symbol], [], true) @path = path unless @config.is_a? Hash |