aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/string
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 /activesupport/lib/active_support/core_ext/string
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 'activesupport/lib/active_support/core_ext/string')
-rw-r--r--activesupport/lib/active_support/core_ext/string/xchar.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/xchar.rb b/activesupport/lib/active_support/core_ext/string/xchar.rb
index 7183218634..26857c8b0d 100644
--- a/activesupport/lib/active_support/core_ext/string/xchar.rb
+++ b/activesupport/lib/active_support/core_ext/string/xchar.rb
@@ -6,7 +6,7 @@ rescue LoadError
# fast_xs extension unavailable
else
begin
- require 'builder'
+ require 'active_support/vendor/builder'
rescue LoadError
# builder demands the first shot at defining String#to_xs
end