From 574deada03399c903bc319605c8d83ede45f87b4 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Tue, 24 May 2011 23:54:31 +0200 Subject: [PATCH] get rid of nil values in app config, they destroy the merge --- lib/app_config.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/app_config.rb b/lib/app_config.rb index d7ec20a14..58683bea0 100644 --- a/lib/app_config.rb +++ b/lib/app_config.rb @@ -85,6 +85,7 @@ class AppConfig end def self.load_config_yaml filename - YAML.load(File.read(filename)) + # nil values are bad for merges and have no meaning here, so lets get rid of them + YAML.load(File.read(filename)).delete_if { |k, v| v.nil? } end end