diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 15:48:29 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 15:48:29 -0300 |
| commit | 42cf96fe9c2af46fdc772135bf282458ff241111 (patch) | |
| tree | 509a0481ef16cfd8d21c51f9f396ef34424cf655 | |
| parent | 00550b57b6f1bb14374d91f2d6f4828bd929a1b5 (diff) | |
| parent | b343abd87517a367e6085b674de2477649de6365 (diff) | |
| download | rails-42cf96fe9c2af46fdc772135bf282458ff241111.tar.gz rails-42cf96fe9c2af46fdc772135bf282458ff241111.tar.bz2 rails-42cf96fe9c2af46fdc772135bf282458ff241111.zip | |
Merge pull request #11213 from neerajdotname/scoped-deprecated
Removed deprecated scoped method
Conflicts:
activerecord/CHANGELOG.md
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | 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 1248fe862b..d6d79dffac 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Removed deprecated method `scoped` + + *Neeraj Singh* + * Removed deprecated method `default_scopes?` *Neeraj Singh* 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 |