aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-28 11:35:36 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-28 11:35:36 -0500
commit4e50a35fa243f6cf7ad567774a9f7c1cb87a1653 (patch)
tree6bfb95c899c61b10406a03f8e9a6211b93fecd6b /activerecord/lib/active_record/associations.rb
parentde203245afd2bbf7f93f3241fcf3a71a88101d47 (diff)
downloadrails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.gz
rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.bz2
rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.zip
Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 76726b7845..157716a477 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -79,7 +79,7 @@ module ActiveRecord
# See ActiveRecord::Associations::ClassMethods for documentation.
module Associations # :nodoc:
- extend ActiveSupport::DependencyModule
+ extend ActiveSupport::Concern
# These classes will be loaded when associations are created.
# So there is no need to eager load them.