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

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

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 388f890a67c4fb5ea0939be59cef429475e2ca0a..eed917eee3c868d2bf6ec19deb258c4481bc54f7 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -23,12 +23,12 @@
 #  note_comments_note_id_fkey    (note_id => notes.id)
 #
 
-class NoteComment < ActiveRecord::Base
-  belongs_to :note, :foreign_key => :note_id, :touch => true
-  belongs_to :author, :class_name => "User", :foreign_key => :author_id
+class NoteComment < ApplicationRecord
+  belongs_to :note, :touch => true
+  belongs_to :author, :class_name => "User"
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
-                 :numericality => { :on => :update, :integer_only => true }
+                 :numericality => { :on => :update, :only_integer => true }
   validates :note, :presence => true, :associated => true
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true