diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
| commit | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (patch) | |
| tree | bebf99e031bc1a3408baf32c2d16bc870637b913 /activerecord/lib/active_record/associations.rb | |
| parent | 983dc8078708fff5d99fc31eb5eac8b532e950b3 (diff) | |
| parent | d20955f889223b6035dbc7d61acba9091bf7b7ed (diff) | |
| download | rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.gz rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.bz2 rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.zip | |
Merge branch 'master' of git@github.com:rails/rails
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 |