Defect #35421 » 35421.patch
lib/redmine/configuration.rb | ||
---|---|---|
95 | 95 |
yaml = YAML::load(ERB.new(File.read(filename)).result) |
96 | 96 |
rescue ArgumentError |
97 | 97 |
abort "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded." |
98 |
rescue SyntaxError => e |
|
98 |
rescue Psych::SyntaxError => e
|
|
99 | 99 |
abort "A syntax error occurred when parsing your Redmine configuration file located at #{filename} with ERB:\n#{e.message}" |
100 | 100 |
end |
101 | 101 |
conf = {} |