diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 16:15:02 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 16:15:02 +0000 |
| commit | ca175ed7c9b357fdb40e7f3e31cd0283354fd54c (patch) | |
| tree | c6fa319e91709048df6a40af8a6fe19f932b85b5 /actionpack | |
| parent | dc3d6eb9b4aaed051dd6d5a5a07f6c66b72da4c4 (diff) | |
| download | rails-ca175ed7c9b357fdb40e7f3e31cd0283354fd54c.tar.gz rails-ca175ed7c9b357fdb40e7f3e31cd0283354fd54c.tar.bz2 rails-ca175ed7c9b357fdb40e7f3e31cd0283354fd54c.zip | |
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
Diffstat (limited to 'actionpack')
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 10 |
1 files changed, 1 insertions, 9 deletions
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' |