aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rwxr-xr-xactionpack/lib/action_controller.rb10
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'