diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 4 | 
2 files changed, 4 insertions, 2 deletions
| diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index d7277a39ec..6190fe1c0f 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@  *SVN* +* Fix typo in documentation for polymorphic associations w/STI. Closes #7461 [johnjosephbachir] +  * Reveal that the type option in migrations can be any supported column type for your database but also include caveat about agnosticism. Closes #7531 [adamwiggins, mikong]  * More complete documentation for find_by_sql. Closes #7912 [fearoffish] diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 16cc4773cd..434612fdc0 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -415,10 +415,10 @@ module ActiveRecord      #     has_many :assets, :as => :attachable, :dependent => :destroy      #   end      # -    #   class GuestPost < ActiveRecord::Base +    #   class GuestPost < Post      #   end      # -    #   class MemberPost < ActiveRecord::Base +    #   class MemberPost < Post      #   end      #      # == Caching | 
