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/fixtures | |
| 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/fixtures')
| -rw-r--r-- | activerecord/test/fixtures/ratings.yml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/activerecord/test/fixtures/ratings.yml b/activerecord/test/fixtures/ratings.yml index 2b45c5080e..34e208efa3 100644 --- a/activerecord/test/fixtures/ratings.yml +++ b/activerecord/test/fixtures/ratings.yml @@ -2,23 +2,13 @@ normal_comment_rating: id: 1 comment_id: 8 value: 1 - type: Rating special_comment_rating: id: 2 comment_id: 6 value: 1 - type: Rating sub_special_comment_rating: id: 3 comment_id: 12 value: 1 - type: Rating - -special_rating: - id: 4 - comment_id: 10 - value: 1 - type: SpecialRating - special_comment_id: 3 |