diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-10 23:01:41 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-10 23:01:41 +0000 |
| commit | e7040b09e8dc381c746a0a3b4dff540eebe7a35d (patch) | |
| tree | 842c2cfeb39de4cb23d20f910297d6b6da7be221 /activesupport/lib/active_support.rb | |
| parent | cff25aae90859d5f47d827b162b505f8b316b733 (diff) | |
| download | rails-e7040b09e8dc381c746a0a3b4dff540eebe7a35d.tar.gz rails-e7040b09e8dc381c746a0a3b4dff540eebe7a35d.tar.bz2 rails-e7040b09e8dc381c746a0a3b4dff540eebe7a35d.zip | |
Rebundle Builder 2.1.2 but prefer a newer RubyGem if available.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7828 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support.rb')
| -rw-r--r-- | activesupport/lib/active_support.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 94f14ead01..e33f6ceb27 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -22,19 +22,9 @@ #++ $:.unshift(File.dirname(__FILE__)) -$:.unshift(File.dirname(__FILE__) + "/active_support/vendor") - -require 'rubygems' -begin - require 'builder' -rescue LoadError - $stderr.puts 'Builder has been unbundled from Active Support in Rails 2.0.' - $stderr.puts 'Please `gem install builder`' - raise -end +require 'active_support/vendor' require 'active_support/basic_object' - require 'active_support/inflector' require 'active_support/core_ext' |