Remove unneeded changes

Remove uneeded changes

app/serializers/member_entity.rb

@@ -40,7 +40,9 @@ class MemberEntity < Grape::Entity
 
   expose :valid_level_roles, as: :valid_roles
 
-  expose :user, if: -> (member) { member.user.present? }, using: MemberUserEntity
+  expose :user, if: -> (member) { member.user.present? } do |member, options|
+    MemberUserEntity.represent(member.user, options)
+  end
 
   expose :state
 

app/serializers/request_aware_entity.rb

@@ -10,6 +10,6 @@ module RequestAwareEntity
   end
 
   def request
-    options.fetch(:request, nil)
+    options.fetch(:request)
   end
 end

lib/api/entities/user_safe.rb

@@ -3,19 +3,15 @@
 module API
   module Entities
     class UserSafe < Grape::Entity
-      include RequestAwareEntity
-
       expose :id, :username
       expose :name do |user|
         next user.name unless user.project_bot?
 
-        current_user = request.respond_to?(:current_user) ? request.current_user : options.fetch(:current_user, nil)
-
         if user.groups
-          next user.name if current_user&.can?(:read_group, user.groups.first)
+          next user.name if options[:current_user]&.can?(:read_group, user.groups.first)
         end
 
-        next user.name if current_user&.can?(:read_project, user.projects.first)
+        next user.name if options[:current_user]&.can?(:read_project, user.projects.first)
 
         # If the requester does not have permission to read the project bot name,
         # the API returns an arbitrary string. UI changes will be addressed in a follow up issue: