mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
Parse configuration file for ERB (#16878).
Patch by Gavin Dunne. git-svn-id: http://svn.redmine.org/redmine/trunk@13150 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
8aeab43247
commit
169711bf46
@ -82,7 +82,7 @@ module Redmine
|
|||||||
def load_from_yaml(filename, env)
|
def load_from_yaml(filename, env)
|
||||||
yaml = nil
|
yaml = nil
|
||||||
begin
|
begin
|
||||||
yaml = YAML::load_file(filename)
|
yaml = YAML::load(ERB.new(File.read(filename)).result)
|
||||||
rescue ArgumentError
|
rescue ArgumentError
|
||||||
$stderr.puts "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded."
|
$stderr.puts "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded."
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user