aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support.rb')
-rw-r--r--activesupport/lib/active_support.rb12
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'