diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
| commit | ae812c0a7bdb876c03752adfaa980ac4e74f2e17 (patch) | |
| tree | 73eba5b0ddce60a4578fcbf6be581b8f35488273 /activemodel | |
| parent | 67f30fd9639409877a57a7ba758cd13496433d69 (diff) | |
| parent | 3c4c6bd0df598f865f49a983b4c65c415af4bcfc (diff) | |
| download | rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.gz rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.bz2 rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/core.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/core.rb b/activemodel/lib/active_model/core.rb index 6b2bee53d9..b4b020defc 100644 --- a/activemodel/lib/active_model/core.rb +++ b/activemodel/lib/active_model/core.rb @@ -1,7 +1,7 @@ begin require 'active_support' rescue LoadError - activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" + activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib" if File.directory?(activesupport_path) $:.unshift activesupport_path require 'active_support' |