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

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

diff --git a/app/models/issue_comment.rb b/app/models/issue_comment.rb
index 3a5894cb3e1b4cab5ee1a91ed077164ed2faf77f..8d150a02f8b88512fdf47070c162dfaadb2dd4e7 100644 (file)
--- a/app/models/issue_comment.rb
+++ b/app/models/issue_comment.rb
@@ -20,11 +20,13 @@
 #  issue_comments_user_id_fkey   (user_id => users.id)
 #
 
-class IssueComment < ActiveRecord::Base
+class IssueComment < ApplicationRecord
   belongs_to :issue
   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