diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
| commit | 0994d11f26c318e63dd4189ea2dfec409132e529 (patch) | |
| tree | 885415e88c615376a7385abba887699f04b3a172 /activerecord/lib/active_record/associations.rb | |
| parent | c77e6ace66b34390e9c1e173c580d86e88915267 (diff) | |
| parent | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (diff) | |
| download | rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.gz rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.bz2 rails-0994d11f26c318e63dd4189ea2dfec409132e529.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index c7cb6eb966..7f7819115c 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1609,7 +1609,7 @@ module ActiveRecord :class_name, :table_name, :join_table, :foreign_key, :association_foreign_key, :select, :conditions, :include, :order, :group, :limit, :offset, :uniq, - :finder_sql, :delete_sql, :insert_sql, + :finder_sql, :counter_sql, :delete_sql, :insert_sql, :before_add, :after_add, :before_remove, :after_remove, :extend, :readonly, :validate |