Merge remote-tracking branch 'dev/master' into 'master'

8dc689cf · Robert Speicher · 57f7a4db · e5f4f1d1 · 8dc689cf
Commit 8dc689cf authored Dec 09, 2015 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/ci/gitlab_ci_yaml_processor.rb lib/ci/gitlab_ci_yaml_processor.rb +1 -1

No files found.
--- 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