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

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

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index eed917eee3c868d2bf6ec19deb258c4481bc54f7..635a5b0def53444f6b5ead14c4d11685a4af6d63 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -25,11 +25,11 @@
 
 class NoteComment < ApplicationRecord
   belongs_to :note, :touch => true
 
 class NoteComment < ApplicationRecord
   belongs_to :note, :touch => true

-  belongs_to :author, :class_name => "User"
+  belongs_to :author, :class_name => "User", :optional => true

 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

-  validates :note, :presence => true, :associated => true
+  validates :note, :associated => true

   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]