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

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

diff --git a/app/models/report.rb b/app/models/report.rb
index ac00f1cfb502366c24d2044b22235f310636ffef..77a96764125bbc8e839d73773a3fbfa50a5d9aa9 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -21,19 +21,16 @@
 #  reports_user_id_fkey   (user_id => users.id)
 #
 
-class Report < ActiveRecord::Base
+class Report < ApplicationRecord
   belongs_to :issue, :counter_cache => true
   belongs_to :user
 
-  validates :issue, :presence => true
-  validates :user, :presence => true
-  validates :details, :presence => true, :invalid_chars => true
+  validates :details, :presence => true, :characters => true
   validates :category, :presence => true
 
   def self.categories_for(reportable)
     case reportable.class.name
-    when "DiaryEntry" then %w[spam offensive threat other]
-    when "DiaryComment" then %w[spam offensive threat other]
+    when "DiaryEntry", "DiaryComment" then %w[spam offensive threat other]
     when "User" then %w[spam offensive threat vandal other]
     when "Note" then %w[spam personal abusive other]
     else %w[other]