From 3dd3ffde06931d47e3052260efba26b1cc5bd7c9 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 25 Nov 2008 13:20:12 -0600
Subject: Depend on rack 0.4.0 instead of vendoring it

---
 actionpack/lib/action_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller.rb')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index a7a7d932c4..da5f1e81e6 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,6 +31,9 @@ rescue LoadError
   end
 end
 
+gem 'rack', '~> 0.4.0'
+require 'rack'
+
 module ActionController
   # TODO: Review explicit to see if they will automatically be handled by
   # the initilizer if they are really needed.
@@ -99,6 +102,5 @@ end
 autoload :Mime, 'action_controller/mime_type'
 
 autoload :HTML, 'action_controller/vendor/html-scanner'
-autoload :Rack, 'action_controller/vendor/rack'
 
 require 'action_view'
-- 
cgit v1.2.3