From 8ad9d14494dbe2a02d95ff6d23373b5662eede52 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 30 Dec 2009 17:34:53 -0800 Subject: Partially revert "ActionDispatch should require as little of ActiveSupport as possible" Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70. --- actionpack/lib/action_dispatch.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionpack') diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 49e1634af5..1e87a016f9 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -21,6 +21,8 @@ # 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' require 'active_support/dependencies/autoload' -- cgit v1.2.3