From 169711bf466279ebe8d929e0fb6eba7bb0a6d0eb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 24 May 2014 10:51:13 +0000 Subject: 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 --- lib/redmine/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb index 09df60d60..051ed7759 100644 --- a/lib/redmine/configuration.rb +++ b/lib/redmine/configuration.rb @@ -82,7 +82,7 @@ module Redmine def load_from_yaml(filename, env) yaml = nil begin - yaml = YAML::load_file(filename) + yaml = YAML::load(ERB.new(File.read(filename)).result) rescue ArgumentError $stderr.puts "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded." exit 1 -- cgit v1.2.3