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

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

diff --git a/app/models/issue_comment.rb b/app/models/issue_comment.rb
index 7a51265f3d90715f72424aafa43d8d79558927eb..8d150a02f8b88512fdf47070c162dfaadb2dd4e7 100644 (file)
--- a/app/models/issue_comment.rb
+++ b/app/models/issue_comment.rb
@@ -2,29 +2,31 @@
 #
 # Table name: issue_comments
 #
-#  id                :integer          not null, primary key
-#  issue_id          :integer          not null
-#  commenter_user_id :integer          not null
-#  body              :text             not null
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
+#  id         :integer          not null, primary key
+#  issue_id   :integer          not null
+#  user_id    :integer          not null
+#  body       :text             not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
-#  index_issue_comments_on_commenter_user_id  (commenter_user_id)
-#  index_issue_comments_on_issue_id           (issue_id)
+#  index_issue_comments_on_issue_id  (issue_id)
+#  index_issue_comments_on_user_id   (user_id)
 #
 # Foreign Keys
 #
-#  issue_comments_commenter_user_id  (commenter_user_id => users.id) ON DELETE => cascade
-#  issue_comments_issue_id_fkey      (issue_id => issues.id) ON DELETE => cascade
+#  issue_comments_issue_id_fkey  (issue_id => issues.id)
+#  issue_comments_user_id_fkey   (user_id => users.id)
 #
 
-class IssueComment < ActiveRecord::Base
+class IssueComment < ApplicationRecord
   belongs_to :issue
-  belongs_to :user, :class_name => "User", :foreign_key => :commenter_user_id
+  belongs_to :user
 
-  validates :body, :presence => true
-  validates :user, :presence => true
-  validates :issue, :presence => true
+  validates :body, :presence => true, :characters => true
+
+  def body
+    RichText.new("markdown", self[:body])
+  end
 end