diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb --- a/vendor/plugins/haml/init.rb +++ b/vendor/plugins/haml/init.rb @@ -1,2 +1,7 @@ -require 'haml' +begin + require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here +rescue LoadError + require 'haml' # From gem +end + Haml.init_rails(binding)