diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 12:20:53 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 12:20:53 +0000 |
| commit | 6d566e82b40d636c13ee1ae3b59737e0620196af (patch) | |
| tree | eb25dfd11537ab1ef90808953d5ec9daf70cd139 /activerecord/lib/active_record.rb | |
| parent | 25b656fefa75954cffff119a14cf7650f4f99a92 (diff) | |
| download | rails-6d566e82b40d636c13ee1ae3b59737e0620196af.tar.gz rails-6d566e82b40d636c13ee1ae3b59737e0620196af.tar.bz2 rails-6d566e82b40d636c13ee1ae3b59737e0620196af.zip | |
Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]. Moved all active support dependencies into active support
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index ac49d114ab..94e835bdf1 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -23,16 +23,13 @@ $:.unshift(File.dirname(__FILE__)) +$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") begin - require 'active_support' + require 'active_support' rescue LoadError - begin - require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' - rescue LoadError - require 'rubygems' - require_gem 'activesupport' - end + require 'rubygems' + require_gem 'activesupport' end require 'active_record/base' |