diff --git a/lib/middleman/core_extensions/front_matter.rb b/lib/middleman/core_extensions/front_matter.rb index a05cb882..b11eb240 100644 --- a/lib/middleman/core_extensions/front_matter.rb +++ b/lib/middleman/core_extensions/front_matter.rb @@ -28,7 +28,7 @@ module Middleman::CoreExtensions::FrontMatter ::Tilt.prefer(HamlTemplate) app.after_configuration do - app.before_processing(:front_matter) do |result| + app.before_processing(:front_matter, 0) do |result| if result && Tilt.mappings.has_key?(result[1].to_s) extensionless_path, template_engine = result full_file_path = "#{extensionless_path}.#{template_engine}" diff --git a/lib/middleman/renderers/liquid.rb b/lib/middleman/renderers/liquid.rb index 20c00647..929fff53 100644 --- a/lib/middleman/renderers/liquid.rb +++ b/lib/middleman/renderers/liquid.rb @@ -16,6 +16,7 @@ module Middleman::Renderers::Liquid if result && result[1] == :liquid request['custom_locals'] ||= {} request['custom_locals'][:data] = data.to_h + # request['custom_locals'].merge(data.to_h) end true diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb index afeca4f5..18d0f21b 100644 --- a/lib/middleman/version.rb +++ b/lib/middleman/version.rb @@ -1,3 +1,3 @@ module Middleman - VERSION = "2.0.9" + VERSION = "2.0.10" end diff --git a/middleman-x86-mingw32.gemspec b/middleman-x86-mingw32.gemspec index 5a0a1291..28aecd6c 100644 --- a/middleman-x86-mingw32.gemspec +++ b/middleman-x86-mingw32.gemspec @@ -45,7 +45,7 @@ eos s.add_dependency("sinatra", ["~> 1.2.6"]) s.add_dependency("rack-test", ["~> 0.6.1"]) s.add_dependency("uglifier", ["~> 1.0.0"]) - s.add_dependency("slim", ["~> 1.0.1"]) + s.add_dependency("slim", ["~> 1.0.2"]) s.add_dependency("haml", ["~> 3.1.0"]) s.add_dependency("sass", ["~> 3.1.7"]) s.add_dependency("compass", ["~> 0.11.3"]) diff --git a/middleman.gemspec b/middleman.gemspec index 731808ea..f53322aa 100644 --- a/middleman.gemspec +++ b/middleman.gemspec @@ -46,7 +46,7 @@ eos # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"]) s.add_dependency("rack-test", ["~> 0.6.1"]) s.add_dependency("uglifier", ["~> 1.0.0"]) - s.add_dependency("slim", ["~> 1.0.1"]) + s.add_dependency("slim", ["~> 1.0.2"]) s.add_dependency("haml", ["~> 3.1.0"]) s.add_dependency("sass", ["~> 3.1.7"]) s.add_dependency("compass", ["~> 0.11.3"])