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 bbc6261640ab48d635d9256a87d754b24e0c31ed..8d150a02f8b88512fdf47070c162dfaadb2dd4e7 100644 (file)
--- a/app/models/issue_comment.rb
+++ b/app/models/issue_comment.rb
@@ -1,8 +1,32 @@
-class IssueComment < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: issue_comments
+#
+#  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_issue_id  (issue_id)
+#  index_issue_comments_on_user_id   (user_id)
+#
+# Foreign Keys
+#
+#  issue_comments_issue_id_fkey  (issue_id => issues.id)
+#  issue_comments_user_id_fkey   (user_id => users.id)
+#
+
+class IssueComment < ApplicationRecord

   belongs_to :issue
   belongs_to :issue

-  belongs_to :user, :class_name => "User", :foreign_key => :commenter_user_id
+  belongs_to :user
+
+  validates :body, :presence => true, :characters => true

 
 

-  validates :body, :presence => true
-  validates :user, :presence => true
-  validates :issue, :presence => true
+  def body
+    RichText.new("markdown", self[:body])
+  end

 end
 end