whoops lets do a deep merge

This commit is contained in:
MrZYX 2011-05-18 19:22:15 +02:00
parent e79a6597e6
commit 1a78c8fca1
2 changed files with 2 additions and 1 deletions

View file

@ -35,7 +35,7 @@ class AppConfig
end
if File.exist? "#{Rails.root}/config/app_config.yml"
all_envs_custom = load_config_yaml "#{Rails.root}/config/app_config.yml"
all_envs.merge!(all_envs_custom)
all_envs.deep_merge!(all_envs_custom)
else
unless Rails.env == "development" || Rails.env == "test"
$stderr.puts "WARNING: No config/app_config.yml found! Look at config/app_config.yml.example for help."

View file

@ -8,6 +8,7 @@ require 'yaml'
require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/core_ext/hash/keys'
require 'active_support/core_ext/hash/deep_merge'
class Rails
def self.root