Merge remote-tracking branch 'upstream/pull/2471'

[rails.git] / app / models / note_comment.rb

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 448703ffa5f8d38471a7ecc2767f4ca41771af7b..9611cfe3af375861b865ec17582b0d278fae6c1f 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -23,7 +23,7 @@
 #  note_comments_note_id_fkey    (note_id => notes.id)
 #
 
 #  note_comments_note_id_fkey    (note_id => notes.id)
 #
 

-class NoteComment < ActiveRecord::Base
+class NoteComment < ApplicationRecord

   belongs_to :note, :foreign_key => :note_id, :touch => true
   belongs_to :author, :class_name => "User", :foreign_key => :author_id
 
   belongs_to :note, :foreign_key => :note_id, :touch => true
   belongs_to :author, :class_name => "User", :foreign_key => :author_id