Merge branch '3.0-stable'

Conflicts: README.md
2013-02-05 22:07:05 -08:00 · 2013-02-05 22:07:05 -08:00 · bb2f40cc72
commit bb2f40cc72
parent 5cedd4c37c 8996e65fd1
3 changed files with 11 additions and 4 deletions
--- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
@ -72,8 +72,9 @@ module Middleman::CoreExtensions
        @cache.delete(path)
      end

-      YAML_ERRORS = [ Exception, ArgumentError ]
+      YAML_ERRORS = [ StandardError ]

+      # https://github.com/tenderlove/psych/issues/23
      if defined?(Psych) && defined?(Psych::SyntaxError)
        YAML_ERRORS << Psych::SyntaxError
      end