Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

2 files changed, 38 insertions, 0 deletions

diff --git a/app/serializers/admin/user_entity.rb b/app/serializers/admin/user_entity.rb
new file mode 100644
index 00000000000..ad96c101822
--- /dev/null
+++ b/app/serializers/admin/user_entity.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Admin
+  class UserEntity < API::Entities::UserSafe
+    include RequestAwareEntity
+    include UsersHelper
+    include UserActionsHelper
+
+    expose :created_at
+    expose :email
+    expose :last_activity_on
+    expose :avatar_url
+    expose :badges do |user|
+      user_badges_in_admin_section(user)
+    end
+
+    expose :projects_count do |user|
+      user.authorized_projects.length
+    end
+
+    expose :actions do |user|
+      admin_actions(user)
+    end
+
+    private
+
+    def current_user
+      options[:current_user]
+    end
+  end
+end
diff --git a/app/serializers/admin/user_serializer.rb b/app/serializers/admin/user_serializer.rb
new file mode 100644
index 00000000000..09036428bab
--- /dev/null
+++ b/app/serializers/admin/user_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Admin
+  class UserSerializer < BaseSerializer
+    entity UserEntity
+  end
+end