dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr-

This commit is contained in:
Parker Moore 2013-04-12 23:11:38 +02:00
parent 0f600a322c
commit bd8d271ce3
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/jekyll.rb
View File

@ -67,7 +67,6 @@ module Jekyll
config = Configuration[Configuration::DEFAULTS] config = Configuration[Configuration::DEFAULTS]
override = Configuration[override].stringify_keys override = Configuration[override].stringify_keys
config = config.read_config_files(config.config_files(override)) config = config.read_config_files(config.config_files(override))
config = config.backwards_compatibilize
# Merge DEFAULTS < _config.yml < override # Merge DEFAULTS < _config.yml < override
config.deep_merge(override).stringify_keys config.deep_merge(override).stringify_keys

2
lib/jekyll/configuration.rb
View File

@ -128,7 +128,7 @@ module Jekyll
$stderr.puts "#{err}" $stderr.puts "#{err}"
end end
configuration configuration.backwards_compatibilize
end end
# Public: Ensure the proper options are set in the configuration to allow for # Public: Ensure the proper options are set in the configuration to allow for