diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-22 01:29:18 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-22 01:29:18 +0200 |
| commit | 919eb200a9a0969c444b938d08eb4661d41ba986 (patch) | |
| tree | 329cbe815d549275cc0dc6aa0f75c18d8954f105 /actionpack/lib/action_dispatch.rb | |
| parent | 56669ec3048de316918ec5ad554fff83d757911b (diff) | |
| parent | b456877cfb7e0cb0bab9ffd5674abd23caba0ab4 (diff) | |
| download | rails-919eb200a9a0969c444b938d08eb4661d41ba986.tar.gz rails-919eb200a9a0969c444b938d08eb4661d41ba986.tar.bz2 rails-919eb200a9a0969c444b938d08eb4661d41ba986.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index cdf81c6648..50d8e91c47 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -24,9 +24,14 @@ activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__) $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path) +activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__) +$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path) + require 'active_support' require 'active_support/dependencies/autoload' +require 'action_pack' +require 'active_model' require 'rack' module Rack @@ -63,6 +68,7 @@ module ActionDispatch autoload :Headers autoload :MimeNegotiation autoload :Parameters + autoload :ParameterFilter autoload :FilterParameters autoload :Upload autoload :UploadedFile, 'action_dispatch/http/upload' |