diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-05-24 10:51:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-05-24 10:51:13 +0000 |
| commit | 169711bf466279ebe8d929e0fb6eba7bb0a6d0eb (patch) | |
| tree | 15f4005a7e30548af447944797a7d39243aaf417 | |
| parent | 8aeab43247f9c246edac565c25fa03d4b295504c (diff) | |
| download | redmine-169711bf466279ebe8d929e0fb6eba7bb0a6d0eb.tar.gz redmine-169711bf466279ebe8d929e0fb6eba7bb0a6d0eb.zip | |
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
| -rw-r--r-- | lib/redmine/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |