From b343abd87517a367e6085b674de2477649de6365 Mon Sep 17 00:00:00 2001
From: Neeraj Singh <neerajdotname@gmail.com>
Date: Mon, 1 Jul 2013 17:24:42 +0530
Subject: Removed deprecated method scoped
---
activerecord/CHANGELOG.md | 4 ++++
activerecord/lib/active_record/associations/association.rb | 5 -----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d6354a75f4..742bf854dc 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Removed deprecated method `scoped`
+
+ *Neeraj Singh*
+
* Remove implicit join references that were deprecated in 4.0.
Example:
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index 3fbdf9eb0b..338d5d2afe 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -84,11 +84,6 @@ module ActiveRecord
target_scope.merge(association_scope)
end
- def scoped
- ActiveSupport::Deprecation.warn "#scoped is deprecated. use #scope instead."
- scope
- end
-
# The scope for this association.
#
# Note that the association_scope is merged into the target_scope only when the
--
cgit v1.2.3