erb_config.diff

Gavin Dunne, 2014-05-13 21:58

Download (876 Bytes)

View differences:

lib/redmine/configuration.rb
82 82
      def load_from_yaml(filename, env)
83 83
        yaml = nil
84 84
        begin
85
          yaml = YAML::load_file(filename)
85
          yaml = YAML::load(ERB.new(File.read(filename)).result)
86 86
        rescue ArgumentError
87 87
          $stderr.puts "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded."
88 88
          exit 1
89
-