Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 28 insertions, 0 deletions

diff --git a/app/serializers/member_user_entity.rb b/app/serializers/member_user_entity.rb
new file mode 100644
index 00000000000..a022966c041
--- /dev/null
+++ b/app/serializers/member_user_entity.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class MemberUserEntity < UserEntity
+  unexpose :show_status
+  unexpose :path
+  unexpose :state
+  unexpose :status_tooltip_html
+
+  expose :avatar_url do |user|
+    user.avatar_url(size: Member::AVATAR_SIZE, only_path: false)
+  end
+
+  expose :blocked do |user|
+    user.blocked?
+  end
+
+  expose :two_factor_enabled do |user|
+    user.two_factor_enabled?
+  end
+
+  expose :status, if: -> (user) { user.status.present? } do
+    expose :emoji do |user|
+      user.status.emoji
+    end
+  end
+end
+
+MemberUserEntity.prepend_if_ee('EE::MemberUserEntity')