diff options
author | Rick Olson <technoweenie@gmail.com> | 2008-03-24 02:50:02 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2008-03-24 02:50:02 +0000 |
commit | 081ddb6f24d70794ee9e071d3ed5302f52b26c4d (patch) | |
tree | a5c8e4a4f02cd38cfb182bdaf0e8491c7a0586d4 /activerecord/lib/active_record.rb | |
parent | 5bf4cbbdb74dfaaac258dc93e54dcae8295211e9 (diff) | |
download | rails-081ddb6f24d70794ee9e071d3ed5302f52b26c4d.tar.gz rails-081ddb6f24d70794ee9e071d3ed5302f52b26c4d.tar.bz2 rails-081ddb6f24d70794ee9e071d3ed5302f52b26c4d.zip |
Merge the has_finder gem, renamed as 'named_scope'. Closes #11404 [nkallen]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record.rb')
-rwxr-xr-x | activerecord/lib/active_record.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 4d85c24584..cedcd8b0a8 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -37,6 +37,7 @@ unless defined? ActiveSupport end require 'active_record/base' +require 'active_record/named_scope' require 'active_record/observer' require 'active_record/query_cache' require 'active_record/validations' @@ -64,6 +65,7 @@ ActiveRecord::Base.class_eval do include ActiveRecord::Observing include ActiveRecord::Timestamp include ActiveRecord::Associations + include ActiveRecord::NamedScope include ActiveRecord::AssociationPreload include ActiveRecord::Aggregations include ActiveRecord::Transactions |