diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-21 14:16:37 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-21 14:16:37 +0200 |
| commit | 0a729b0a9138841676e86e1a33337c573028e9af (patch) | |
| tree | d355980982fa35a4339656d39dc77bc6531f2b6e /actionpack | |
| parent | 53310614d7ef279e3b2d5b02e4468e3e3f25e0cd (diff) | |
| download | rails-0a729b0a9138841676e86e1a33337c573028e9af.tar.gz rails-0a729b0a9138841676e86e1a33337c573028e9af.tar.bz2 rails-0a729b0a9138841676e86e1a33337c573028e9af.zip | |
Fix failing railties tests.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 9bb0471ffc..50d8e91c47 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -24,6 +24,9 @@ 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' |