options.rb in config-1.1.0

- old
+ new

@@ -1,6 +1,7 @@
 require 'ostruct'
+
 module Config
   class Options < OpenStruct
     include Enumerable
 
     def keys
@@ -50,19 +51,23 @@
         source_conf = source.load
 
         if conf.empty?
           conf = source_conf
         else
-          DeepMerge.deep_merge!(source_conf, conf, :preserve_unmergeables => false)
+          # see Options Details in lib/rails_config/vendor/deep_merge.rb
+          DeepMerge.deep_merge!(source_conf,
+                                conf,
+                                preserve_unmergeables: false,
+                                knockout_prefix: Config.knockout_prefix)
         end
       end
 
       # swap out the contents of the OStruct with a hash (need to recursively convert)
       marshal_load(__convert(conf).marshal_dump)
 
       reload_env! if Config.use_env
 
-      return self
+      self
     end
 
     alias :load! :reload!
 
     def reload_from_files(*files)