diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-03-15 06:21:53 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-03-15 06:21:53 -0700 |
| commit | 0721d3b37062eca73da3efd669142d7e381e4d80 (patch) | |
| tree | 75a10eb4357b101161563c380e676412dcc4c455 /activerecord/lib/active_record/associations.rb | |
| parent | df21d1eaee11e82c9a83566e2d7c4b771e344686 (diff) | |
| parent | cd87c85ef05e47f6ea1ce7422ae033fe6d82b030 (diff) | |
| download | rails-0721d3b37062eca73da3efd669142d7e381e4d80.tar.gz rails-0721d3b37062eca73da3efd669142d7e381e4d80.tar.bz2 rails-0721d3b37062eca73da3efd669142d7e381e4d80.zip | |
Merge pull request #9683 from senny/deprecate_count_distinct_option
rename `Relation#uniq` to `Relation#distinct`
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 06da5f2e0d..0c670bdaa1 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -241,6 +241,7 @@ module ActiveRecord # others.destroy_all | X | X | X # others.find(*args) | X | X | X # others.exists? | X | X | X + # others.distinct | X | X | X # others.uniq | X | X | X # others.reset | X | X | X # |