diff options
author | Yves Senn <yves.senn@gmail.com> | 2013-07-04 00:05:57 -0700 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2013-07-04 00:05:57 -0700 |
commit | c95911023c4e388faf1065ac46cae0e2bb1914eb (patch) | |
tree | a17969704ef5e65d3a678237066fec1abd090352 /activerecord/lib/active_record/scoping/named.rb | |
parent | b785e921d186753d905c1d0415b91d0987958028 (diff) | |
parent | 50cbc03d18c5984347965a94027879623fc44cce (diff) | |
download | rails-c95911023c4e388faf1065ac46cae0e2bb1914eb.tar.gz rails-c95911023c4e388faf1065ac46cae0e2bb1914eb.tar.bz2 rails-c95911023c4e388faf1065ac46cae0e2bb1914eb.zip |
Merge pull request #11277 from arunagw/deprecation-removed
Deprecation removed
Diffstat (limited to 'activerecord/lib/active_record/scoping/named.rb')
-rw-r--r-- | activerecord/lib/active_record/scoping/named.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb index e7d5e6ce84..7c51aa6979 100644 --- a/activerecord/lib/active_record/scoping/named.rb +++ b/activerecord/lib/active_record/scoping/named.rb @@ -141,19 +141,6 @@ module ActiveRecord def scope(name, body, &block) extension = Module.new(&block) if block - # Check body.is_a?(Relation) to prevent the relation actually being - # loaded by respond_to? - if body.is_a?(Relation) || !body.respond_to?(:call) - ActiveSupport::Deprecation.warn( - "Using #scope without passing a callable object is deprecated. For " \ - "example `scope :red, where(color: 'red')` should be changed to " \ - "`scope :red, -> { where(color: 'red') }`. There are numerous gotchas " \ - "in the former usage and it makes the implementation more complicated " \ - "and buggy. (If you prefer, you can just define a class method named " \ - "`self.red`.)" - ) - end - singleton_class.send(:define_method, name) do |*args| if body.respond_to?(:call) scope = all.scoping { body.call(*args) } |