Skip to content
Browse files

Require builder before fast_xs so we don't tickle its over-eager Stri…

…ng#to_xs collision check
  • Loading branch information...
1 parent 720ffdc commit 0f07b537cef715eb48169675d5582a06f4277b40 @jeremy jeremy committed Nov 24, 2008
Showing with 2 additions and 1 deletion.
  1. +2 −1 activesupport/lib/active_support/vendor.rb
View
3 activesupport/lib/active_support/vendor.rb
@@ -6,6 +6,7 @@
rescue Gem::LoadError
$:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
end
+require 'builder'
begin
gem 'xml-simple', '~> 1.0.11'
@@ -31,4 +32,4 @@
# rescue Gem::LoadError
$:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.0.1"
require 'i18n'
-# end
+# end

0 comments on commit 0f07b53

Please sign in to comment.
Something went wrong with that request. Please try again.