lib/sass/plugin/merb.rb in haml-2.0.2 vs lib/sass/plugin/merb.rb in haml-2.0.3
- old
+ new
@@ -4,10 +4,10 @@
version = Merb::VERSION.split('.').map { |n| n.to_i }
if version[0] <= 0 && version[1] < 5
root = MERB_ROOT
env = MERB_ENV
else
- root = Merb.root
+ root = Merb.root.to_s
env = Merb.environment
end
Sass::Plugin.options.merge!(:template_location => root + '/public/stylesheets/sass',
:css_location => root + '/public/stylesheets',