Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 0 deletions

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index a3a1748142f..7cfebf0473f 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -2,6 +2,7 @@
 
 class AbuseReport < ApplicationRecord
   include CacheMarkdownField
+  include Sortable
 
   cache_markdown_field :message, pipeline: :single_line
 
@@ -13,6 +14,9 @@ class AbuseReport < ApplicationRecord
   validates :message, presence: true
   validates :user_id, uniqueness: { message: 'has already been reported' }
 
+  scope :by_user, -> (user) { where(user_id: user) }
+  scope :with_users, -> { includes(:reporter, :user) }
+
   # For CacheMarkdownField
   alias_method :author, :reporter