diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-21 12:15:57 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-21 12:15:57 -0300 |
| commit | 6931bed1b41ae9d8b5ba4978156211082b873816 (patch) | |
| tree | 88b6b7cd12c6935433fbfad8e6adf95e237d699f /activerecord/test/models | |
| parent | 1a6b25574fdc831ff4c100642b5e0bfe529fe08f (diff) | |
| download | rails-6931bed1b41ae9d8b5ba4978156211082b873816.tar.gz rails-6931bed1b41ae9d8b5ba4978156211082b873816.tar.bz2 rails-6931bed1b41ae9d8b5ba4978156211082b873816.zip | |
Revert "Merge pull request #14544 from jefflai2/named_scope_sti"
This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing
changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065.
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/models/comment.rb
This change break integration with activerecord-deprecated_finders so
I'm reverting until we find a way to make it work with this gem.
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/comment.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/models/rating.rb | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb index d5a1231060..15970758db 100644 --- a/activerecord/test/models/comment.rb +++ b/activerecord/test/models/comment.rb @@ -42,7 +42,6 @@ class SubSpecialComment < SpecialComment end class VerySpecialComment < Comment - scope :special_parent, ->(special_rating) { where parent_id: special_rating.special_comment.id } end class CommentThatAutomaticallyAltersPostBody < Comment diff --git a/activerecord/test/models/rating.rb b/activerecord/test/models/rating.rb index 5409230c2e..25a52c4ad7 100644 --- a/activerecord/test/models/rating.rb +++ b/activerecord/test/models/rating.rb @@ -2,7 +2,3 @@ class Rating < ActiveRecord::Base belongs_to :comment has_many :taggings, :as => :taggable end - -class SpecialRating < Rating - belongs_to :special_comment -end |