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

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

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 9611cfe3af375861b865ec17582b0d278fae6c1f..eed917eee3c868d2bf6ec19deb258c4481bc54f7 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -24,8 +24,8 @@
 #
 
 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, :touch => true
+  belongs_to :author, :class_name => "User"
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }