From ca175ed7c9b357fdb40e7f3e31cd0283354fd54c Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 15 Feb 2005 16:15:02 +0000 Subject: All libraries should link against the independent active support git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@625 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 30245e934a..51db64bf44 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -24,18 +24,10 @@ $:.unshift(File.dirname(__FILE__)) begin - require 'active_support/core_ext' - require 'active_support/clean_logger' - require 'active_support/misc' - require 'active_support/dependencies' + require 'active_support' rescue LoadError require 'rubygems' require_gem 'activesupport' - - require 'active_support/core_ext' - require 'active_support/clean_logger' - require 'active_support/misc' - require 'active_support/dependencies' end require 'action_controller/base' -- cgit v1.2.3