lib/figleaf/settings.rb in figleaf-0.2.4 vs lib/figleaf/settings.rb in figleaf-0.2.5

@@ -41,10 +41,13 @@
       def load_settings(file_pattern = default_file_pattern, env_to_load = env)
         configure_with_auto_define do
           Dir.glob(file_pattern).each do |file|
             property_name = File.basename(file, '.yml')
             yaml_hash     = load_file(file) or next
+            default       = yaml_hash["default"]
             property      = yaml_hash[env_to_load]
+
+            property = default.merge(property) if !default.nil?
 
             next if property.nil?
 
             if self.respond_to?(property_name) &&
                 self.send(property_name).respond_to?(:merge) &&