From 0aad5abcc8f3893dd0664b0813fa6815f7e43527 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 17 Feb 2005 19:04:47 +0000 Subject: AR, AP, and AM should look for AS in sibling directory before trying RubyGems #648 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@648 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 0541413625..04d16b41f3 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -27,8 +27,12 @@ $:.unshift(File.dirname(__FILE__)) begin require 'active_support' rescue LoadError - require 'rubygems' - require_gem 'activesupport' + begin + require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' + rescue LoadError + require 'rubygems' + require_gem 'activesupport' + end end require 'active_record/base' -- cgit v1.2.3