From bb153f42e45160c5ef3593c393db5d3c6857fb70 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Wed, 30 Dec 2009 12:58:40 -0800 Subject: ActionDispatch should require as little of ActiveSupport as possible --- actionpack/lib/action_dispatch.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 7f61ff5657..49e1634af5 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -21,9 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__) -$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path) -require 'active_support/ruby/shim' +require 'active_support' require 'active_support/dependencies/autoload' require 'rack' -- cgit v1.2.3