Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 30 deletions

diff --git a/app/serializers/admin/abuse_report_entity.rb b/app/serializers/admin/abuse_report_entity.rb
index 456640bf836..58637445e81 100644
--- a/app/serializers/admin/abuse_report_entity.rb
+++ b/app/serializers/admin/abuse_report_entity.rb
@@ -3,50 +3,21 @@
 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, :created_at])
+      UserEntity.represent(report.user, only: [:name])
     end
 
     expose :reporter do |report|
       UserEntity.represent(report.reporter, only: [:name])
     end
 
-    expose :reported_user_path do |report|
-      user_path(report.user)
-    end
-
-    expose :reporter_path do |report|
-      user_path(report.reporter)
-    end
-
-    expose :user_blocked do |report|
-      report.user.blocked?
-    end
-
-    expose :block_user_path do |report|
-      block_admin_user_path(report.user)
-    end
-
-    expose :remove_report_path do |report|
-      admin_abuse_report_path(report)
-    end
-
     expose :report_path do |report|
       admin_abuse_report_path(report)
     end
-
-    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