aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template/handlers
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-13 22:55:46 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-13 22:55:46 -0500
commitb2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 (patch)
tree05ae73741366a390fd543b67f7080325c8d7525e /actionpack/lib/action_view/template/handlers
parent6f9e449830902319d3c0897e67d8ac9c89bff39d (diff)
downloadrails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.gz
rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.bz2
rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.zip
Rollback AS bundler work and improve activation of vendored dependencies
Diffstat (limited to 'actionpack/lib/action_view/template/handlers')
-rw-r--r--actionpack/lib/action_view/template/handlers/builder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index 5f381f7bf0..ba0d17b5af 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -6,7 +6,7 @@ module ActionView
self.default_format = Mime::XML
def compile(template)
- require 'builder'
+ require 'active_support/vendor/builder'
"xml = ::Builder::XmlMarkup.new(:indent => 2);" +
"self.output_buffer = xml.target!;" +
template.source +