Merge remote-tracking branch 'origin/3.0-stable'
Conflicts: middleman-core/lib/middleman-core/core_extensions/data.rb middleman-core/lib/middleman-core/core_extensions/front_matter.rb middleman-core/lib/middleman-core/util.rb middleman-core/middleman-core-x86-mingw32.gemspec middleman-more/lib/middleman-more/core_extensions/default_helpers.rb middleman-more/lib/middleman-more/core_extensions/i18n.rb
This commit is contained in:
commit
52c4677391
28 changed files with 440 additions and 115 deletions
|
@ -24,12 +24,12 @@ module Middleman
|
|||
# Setup data files before anything else so they are available when
|
||||
# parsing config.rb
|
||||
def initialize
|
||||
files.changed DataStore.matcher do |file|
|
||||
data.touch_file(file) if file.match(%r{^#{config[:data_dir]}\/})
|
||||
self.files.changed DataStore.matcher do |file|
|
||||
self.data.touch_file(file) if file.start_with?("#{config[data_dir]}/")
|
||||
end
|
||||
|
||||
files.deleted DataStore.matcher do |file|
|
||||
data.remove_file(file) if file.match(%r{^#{config[data_dir]}\/})
|
||||
self.files.deleted DataStore.matcher do |file|
|
||||
self.data.remove_file(file) if file.start_with?("#{config[data_dir]}/")
|
||||
end
|
||||
|
||||
super
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue