aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-06-08 19:59:56 -0500
committerJoshua Peek <josh@joshpeek.com>2009-06-08 19:59:56 -0500
commit01515f8ecd90150320c7edf1df23850f2a4fdf07 (patch)
treefffa083895aa7888087d9b3da8dbe7202742eeaa /activemodel
parentbe371993b7c0bb5110a38d4c3bade116b66a904a (diff)
downloadrails-01515f8ecd90150320c7edf1df23850f2a4fdf07.tar.gz
rails-01515f8ecd90150320c7edf1df23850f2a4fdf07.tar.bz2
rails-01515f8ecd90150320c7edf1df23850f2a4fdf07.zip
Fix activesupport path
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index 803f5b0157..a3545f1d53 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -21,12 +21,10 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
-activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib"
+activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
$:.unshift(activesupport_path) if File.directory?(activesupport_path)
require 'active_support'
-require 'active_support/inflector'
-
module ActiveModel
autoload :Base, 'active_model/base'
autoload :Observing, 'active_model/observing'