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

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

diff --git a/app/models/report.rb b/app/models/report.rb
index 9bbf221df75c3cc0237044957321b6b372ed2da3..346c5eea95c3d13205f1bb5ad5bc3d4b6ce9436e 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -21,7 +21,7 @@
 #  reports_user_id_fkey   (user_id => users.id)
 #
 
 #  reports_user_id_fkey   (user_id => users.id)
 #
 

-class Report < ActiveRecord::Base
+class Report < ApplicationRecord

   belongs_to :issue, :counter_cache => true
   belongs_to :user
 
   belongs_to :issue, :counter_cache => true
   belongs_to :user
 


@@ -32,8 +32,7 @@ class Report < ActiveRecord::Base
 
   def self.categories_for(reportable)
     case reportable.class.name
 
   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]
     when "User" then %w[spam offensive threat vandal other]
     when "Note" then %w[spam personal abusive other]
     else %w[other]