diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-24 11:39:51 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-24 11:39:51 -0800 |
| commit | 0f07b537cef715eb48169675d5582a06f4277b40 (patch) | |
| tree | 80768b5330f5bd688116f5ba329d778302c5a6a9 /activesupport | |
| parent | 720ffdc42fd70e296cc4565a80891fdc8cb91362 (diff) | |
| download | rails-0f07b537cef715eb48169675d5582a06f4277b40.tar.gz rails-0f07b537cef715eb48169675d5582a06f4277b40.tar.bz2 rails-0f07b537cef715eb48169675d5582a06f4277b40.zip | |
Require builder before fast_xs so we don't tickle its over-eager String#to_xs collision check
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index 23ceeb1359..4202c287d0 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -6,6 +6,7 @@ begin 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 @@ end # rescue Gem::LoadError $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.0.1" require 'i18n' -# end
\ No newline at end of file +# end |