Permalink
Browse files

Merge pull request #11213 from neerajdotname/scoped-deprecated

Removed deprecated scoped method

Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
2 parents 00550b5 + b343abd commit 42cf96fe9c2af46fdc772135bf282458ff241111 @rafaelfranca rafaelfranca committed Jul 1, 2013
Showing with 4 additions and 5 deletions.
  1. +4 −0 activerecord/CHANGELOG.md
  2. +0 −5 activerecord/lib/active_record/associations/association.rb
@@ -1,3 +1,7 @@
+* Removed deprecated method `scoped`
+
+ *Neeraj Singh*
+
* Removed deprecated method `default_scopes?`
*Neeraj Singh*
@@ -84,11 +84,6 @@ def scope
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

0 comments on commit 42cf96f

Please sign in to comment.