Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

1 files changed, 8 insertions, 1 deletions

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index dbcdfa5e946..5ae5367ca5a 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -42,7 +42,9 @@ class AbuseReport < ApplicationRecord
   before_validation :filter_empty_strings_from_links_to_spam
   validate :links_to_spam_contains_valid_urls
 
-  scope :by_user, ->(user) { where(user_id: user) }
+  scope :by_user_id, ->(id) { where(user_id: id) }
+  scope :by_reporter_id, ->(id) { where(reporter_id: id) }
+  scope :by_category, ->(category) { where(category: category) }
   scope :with_users, -> { includes(:reporter, :user) }
 
   enum category: {
@@ -56,6 +58,11 @@ class AbuseReport < ApplicationRecord
     other: 8
   }
 
+  enum status: {
+    open: 1,
+    closed: 2
+  }
+
   # For CacheMarkdownField
   alias_method :author, :reporter