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

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

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index 75b1a055b23dd1306a4469e4819d2cf531c2923d..1b78f98e8d2da289ddefa3c25262ffc70e790af3 100644 (file)
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -19,14 +19,14 @@
 #  changeset_comments_changeset_id_fkey  (changeset_id => changesets.id)
 #
 
 #  changeset_comments_changeset_id_fkey  (changeset_id => changesets.id)
 #
 

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

   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

-  validates :changeset, :presence => true, :associated => true
-  validates :author, :presence => true, :associated => true
+  validates :changeset, :associated => true
+  validates :author, :associated => true

   validates :visible, :inclusion => [true, false]
   validates :body, :characters => true
 
   validates :visible, :inclusion => [true, false]
   validates :body, :characters => true