Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 2 insertions, 19 deletions

diff --git a/app/serializers/admin/abuse_report_details_entity.rb b/app/serializers/admin/abuse_report_details_entity.rb
index c0394eb38c5..f0e84fc44d2 100644
--- a/app/serializers/admin/abuse_report_details_entity.rb
+++ b/app/serializers/admin/abuse_report_details_entity.rb
@@ -71,6 +71,7 @@ module Admin
     end
 
     expose :report do
+      expose :status
       expose :message
       expose :created_at, as: :reported_at
       expose :category
@@ -78,27 +79,9 @@ module Admin
       expose :reported_content, as: :content
       expose :reported_from_url, as: :url
       expose :screenshot_path, as: :screenshot
-    end
-
-    expose :actions, if: ->(report) { report.user } do
-      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|
+      expose :update_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 :reported_user do |report|
-        UserEntity.represent(report.user, only: [:name, :created_at])
-      end
-      expose :redirect_path do |_|
-        admin_abuse_reports_path
-      end
     end
   end
 end