aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2015-01-25 16:40:23 -0700
committerSean Griffin <sean@thoughtbot.com>2015-01-25 16:40:23 -0700
commit87726b93d4fd447671d0b20ae2ec37a9eb4f2fd4 (patch)
tree388e0a8442b85432310a3e116f7c61ddc05fc5bc /activerecord/lib/active_record/associations
parentdef2879d7d187df945d77c1028d4cef588cbc8a0 (diff)
downloadrails-87726b93d4fd447671d0b20ae2ec37a9eb4f2fd4.tar.gz
rails-87726b93d4fd447671d0b20ae2ec37a9eb4f2fd4.tar.bz2
rails-87726b93d4fd447671d0b20ae2ec37a9eb4f2fd4.zip
Remove references to `:bind` in `except`
Bind values are no longer a thing, so this is unnecessary.
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/association_scope.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
index d06b7b3508..3d71e73b3c 100644
--- a/activerecord/lib/active_record/associations/association_scope.rb
+++ b/activerecord/lib/active_record/associations/association_scope.rb
@@ -160,7 +160,7 @@ module ActiveRecord
item = eval_scope(reflection.klass, scope_chain_item, owner)
if scope_chain_item == refl.scope
- scope.merge! item.except(:where, :includes, :bind)
+ scope.merge! item.except(:where, :includes)
end
reflection.all_includes do