Merge pull request #77 from ruby/haml5

Upgrade haml5

Author: hsbt

Gemfile

@@ -10,5 +10,5 @@ gem "middleman-sprockets"
 gem "middleman-blog"
 gem 'middleman-gh-pages'
 gem "redcarpet"
-gem 'haml', "~> 4.0.7"
+gem 'haml'
 gem 'sass'

Gemfile.lock

@@ -26,7 +26,8 @@ GEM
     fast_blank (1.0.0)
     fastimage (2.1.7)
     ffi (1.12.2)
-    haml (4.0.7)
+    haml (5.1.2)
+      temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
@@ -130,6 +131,7 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
+    temple (0.8.2)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -142,7 +144,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  haml (~> 4.0.7)
+  haml
   middleman
   middleman-blog
   middleman-gh-pages

config.rb

@@ -49,3 +49,5 @@
   activate :minify_css
   activate :minify_javascript
 end
+
+Haml::TempleEngine.disable_option_validator!