diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-06 11:32:14 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-06 11:32:14 -0300 |
| commit | 118b19a9fa59587e72af315bfbc0e6812025f12b (patch) | |
| tree | c810188083054261db50c1f45c849b34f033c8f5 /activemodel | |
| parent | a83a1ccebaaae5e05741ebd5d9db408c450df098 (diff) | |
| parent | 6d4a4fabbbb04c20cee51c4e374045cc75e2ec16 (diff) | |
| download | rails-118b19a9fa59587e72af315bfbc0e6812025f12b.tar.gz rails-118b19a9fa59587e72af315bfbc0e6812025f12b.tar.bz2 rails-118b19a9fa59587e72af315bfbc0e6812025f12b.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/core.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/activemodel/lib/active_model/core.rb b/activemodel/lib/active_model/core.rb index b4b020defc..4201bcf158 100644 --- a/activemodel/lib/active_model/core.rb +++ b/activemodel/lib/active_model/core.rb @@ -1,12 +1,3 @@ -begin - require 'active_support' -rescue LoadError - activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib" - if File.directory?(activesupport_path) - $:.unshift activesupport_path - require 'active_support' - end -end - -# So far, we only need the string inflections and not the rest of ActiveSupport. +activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib" +$:.unshift(activesupport_path) if File.directory?(activesupport_path) require 'active_support/inflector' |