Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/serializers/admin/abuse_report_entity.rb b/app/serializers/admin/abuse_report_entity.rb
index 106467d4018..54916d02ecb 100644
--- a/app/serializers/admin/abuse_report_entity.rb
+++ b/app/serializers/admin/abuse_report_entity.rb
@@ -3,12 +3,14 @@
 module Admin
   class AbuseReportEntity < Grape::Entity
     include RequestAwareEntity
+    include MarkupHelper
 
     expose :category
+    expose :created_at
     expose :updated_at
 
     expose :reported_user do |report|
-      UserEntity.represent(report.user, only: [:name])
+      UserEntity.represent(report.user, only: [:name, :created_at])
     end
 
     expose :reporter do |report|
@@ -38,5 +40,9 @@ module Admin
     expose :remove_user_and_report_path do |report|
       admin_abuse_report_path(report, remove_user: true)
     end
+
+    expose :message do |report|
+      markdown_field(report, :message)
+    end
   end
 end