aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-01 11:46:08 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-01 11:46:08 -0700
commit00550b57b6f1bb14374d91f2d6f4828bd929a1b5 (patch)
tree97a4d3a238bb02574836d0269c07598406687788
parentab6601ccdf15c5b3951b7762387f329c07e39edb (diff)
parent432cbc8419b36a22a25978e2de4a2be03b3683b6 (diff)
downloadrails-00550b57b6f1bb14374d91f2d6f4828bd929a1b5.tar.gz
rails-00550b57b6f1bb14374d91f2d6f4828bd929a1b5.tar.bz2
rails-00550b57b6f1bb14374d91f2d6f4828bd929a1b5.zip
Merge pull request #11212 from neerajdotname/default_scopes_q_deprecated
Removed deprecated default_scopes?
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/scoping/default.rb8
2 files changed, 4 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d6354a75f4..1248fe862b 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Removed deprecated method `default_scopes?`
+
+ *Neeraj Singh*
+
* Remove implicit join references that were deprecated in 4.0.
Example:
diff --git a/activerecord/lib/active_record/scoping/default.rb b/activerecord/lib/active_record/scoping/default.rb
index d37d33d552..59bdb9166e 100644
--- a/activerecord/lib/active_record/scoping/default.rb
+++ b/activerecord/lib/active_record/scoping/default.rb
@@ -8,14 +8,6 @@ module ActiveRecord
class_attribute :default_scopes, instance_writer: false, instance_predicate: false
self.default_scopes = []
-
- def self.default_scopes?
- ActiveSupport::Deprecation.warn(
- "#default_scopes? is deprecated. Do something like #default_scopes.empty? instead."
- )
-
- !!self.default_scopes
- end
end
module ClassMethods