aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-04-08 23:53:25 +0100
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-12 19:46:04 -0700
commit788bd30859f3f21184defd240c3d32f179515225 (patch)
tree44097a9006b805f17dcb3180a966b97ab43bdcb1 /activerecord/lib/active_record/relation.rb
parent8572ae6671c6ec7c2524f327cee82215896e5648 (diff)
downloadrails-788bd30859f3f21184defd240c3d32f179515225.tar.gz
rails-788bd30859f3f21184defd240c3d32f179515225.tar.bz2
rails-788bd30859f3f21184defd240c3d32f179515225.zip
ActiveRecord::Base.scopes hash is not needed
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 4aa2516cb2..490360ccb5 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -416,8 +416,6 @@ module ActiveRecord
def method_missing(method, *args, &block)
if Array.method_defined?(method)
to_a.send(method, *args, &block)
- elsif @klass.scopes[method]
- merge(@klass.send(method, *args, &block))
elsif @klass.respond_to?(method)
scoping { @klass.send(method, *args, &block) }
elsif arel.respond_to?(method)