From e8550ee0329586b32de425e905c7af7e65bc78a8 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 13 May 2009 01:10:37 -0700
Subject: Cherry-pick core extensions

---
 actionpack/test/abstract_controller/test_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test/abstract_controller')

diff --git a/actionpack/test/abstract_controller/test_helper.rb b/actionpack/test/abstract_controller/test_helper.rb
index a08ab5a6d7..915054f7fb 100644
--- a/actionpack/test/abstract_controller/test_helper.rb
+++ b/actionpack/test/abstract_controller/test_helper.rb
@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'test/unit'
-require 'active_support/core/all'
+require 'active_support'
 require 'active_support/test_case'
 require 'action_controller/abstract'
 require 'action_view'
@@ -18,4 +18,4 @@ begin
   Debugger.start
 rescue LoadError
   # Debugging disabled. `gem install ruby-debug` to enable.
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3