Merge remote-tracking branch 'upstream/pull/2915' into master

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 4ae21be8881922e49c799ba0868e93ba0f5e77f5..05f5044c5db779b232da81bd6e3bbdf0ba31d5b5 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -22,7 +22,7 @@
 #  diary_comments_user_id_fkey         (user_id => users.id)
 #
 
 #  diary_comments_user_id_fkey         (user_id => users.id)
 #
 

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

   belongs_to :user
   belongs_to :diary_entry
 
   belongs_to :user
   belongs_to :diary_entry