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

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

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index ceb7d35597f75e816811214fbfa252eddd7470d0..d825c9ed58d4fe1f3ef99937278238848585a654 100644 (file)
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -11,7 +11,10 @@
 #
 # Indexes
 #
 #
 # Indexes
 #

-#  index_changeset_comments_on_created_at  (created_at)
+#  index_changeset_comments_on_author_id_and_created_at     (author_id,created_at)
+#  index_changeset_comments_on_author_id_and_id             (author_id,id)
+#  index_changeset_comments_on_changeset_id_and_created_at  (changeset_id,created_at)
+#  index_changeset_comments_on_created_at                   (created_at)

 #
 # Foreign Keys
 #
 #
 # Foreign Keys
 #


@@ -23,10 +26,12 @@ class ChangesetComment < ApplicationRecord
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 

+  scope :visible, -> { where(:visible => 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 :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