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

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

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index 756fda14c6e7b85adb198d89ddf002316ce9d740..1b78f98e8d2da289ddefa3c25262ffc70e790af3 100644 (file)
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -3,8 +3,8 @@
 # Table name: changeset_comments
 #
 #  id           :integer          not null, primary key
 # Table name: changeset_comments
 #
 #  id           :integer          not null, primary key

-#  changeset_id :integer          not null
-#  author_id    :integer          not null
+#  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
 #  body         :text             not null
 #  created_at   :datetime         not null
 #  visible      :boolean          not null


@@ -19,16 +19,16 @@
 #  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 },
   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 :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
 
   # Return the comment text
   def body