aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-01 16:14:59 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-01 16:14:59 -0300
commitc311447a0f1da00dfc1353645c486cc93cd575c8 (patch)
tree2ae77553856cfe89f2142beb6aa6f81529c0742a /activerecord
parente456ad514aca81cbcb67ea9d919730ac00724a38 (diff)
downloadrails-c311447a0f1da00dfc1353645c486cc93cd575c8.tar.gz
rails-c311447a0f1da00dfc1353645c486cc93cd575c8.tar.bz2
rails-c311447a0f1da00dfc1353645c486cc93cd575c8.zip
:uniq is still a valid relation option since it was only silently
deprecated Fixes activerecord-deprecated_finders build. https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 4d24654015..c7b6c715f5 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -10,7 +10,7 @@ module ActiveRecord
:extending]
SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :from, :reordering,
- :reverse_order, :distinct, :create_with]
+ :reverse_order, :distinct, :create_with, :uniq]
VALUE_METHODS = MULTI_VALUE_METHODS + SINGLE_VALUE_METHODS