From 6931bed1b41ae9d8b5ba4978156211082b873816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 21 May 2014 12:15:57 -0300 Subject: 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. --- activerecord/test/models/comment.rb | 1 - activerecord/test/models/rating.rb | 4 ---- 2 files changed, 5 deletions(-) (limited to 'activerecord/test/models') 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 -- cgit v1.2.3