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

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

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index 2fedadff04129e72e0d5eaee741309246c485d28..3bc9483fa9c904da8f65df1be3758a17784f6798 100644 (file)
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -1,13 +1,36 @@
-class ChangesetComment < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: changeset_comments
+#
+#  id           :integer          not null, primary key
+#  changeset_id :bigint(8)        not null
+#  author_id    :bigint(8)        not null
+#  body         :text             not null
+#  created_at   :datetime         not null
+#  visible      :boolean          not null
+#
+# Indexes
+#
+#  index_changeset_comments_on_author_id_and_created_at     (author_id,created_at)
+#  index_changeset_comments_on_changeset_id_and_created_at  (changeset_id,created_at)
+#  index_changeset_comments_on_created_at                   (created_at)
+#
+# Foreign Keys
+#
+#  changeset_comments_author_id_fkey     (author_id => users.id)
+#  changeset_comments_changeset_id_fkey  (changeset_id => changesets.id)
+#
+
+class ChangesetComment < ApplicationRecord
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
-                 :numericality => { :on => :update, :integer_only => true }
-  validates :changeset, :presence => true, :associated => true
-  validates :author, :presence => true, :associated => true
+                 :numericality => { :on => :update, :only_integer => true }
+  validates :changeset, :associated => true
+  validates :author, :associated => true
   validates :visible, :inclusion => [true, false]
-  validates :body, :format => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/
+  validates :body, :characters => true
 
   # Return the comment text
   def body