Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 6 insertions, 5 deletions

diff --git a/app/serializers/issue_entity.rb b/app/serializers/issue_entity.rb
index a38f345f617..340fd8803af 100644
--- a/app/serializers/issue_entity.rb
+++ b/app/serializers/issue_entity.rb
@@ -89,12 +89,13 @@ class IssueEntity < IssuableEntity
   end
 
   expose :issue_email_participants do |issue|
-    # TODO - This is a Temporary solution to avoid leaking participants' emails
-    # on public/internal projects when issue is not confidential.
-    # Should be removed when https://gitlab.com/gitlab-org/gitlab/-/issues/383448 is implemented.
-    next [] unless issue.confidential?
+    presented_issue = issue.present(current_user: request.current_user)
 
-    issue.issue_email_participants.map { |x| { email: x.email } }
+    presented_issue.issue_email_participants.map do |participant|
+      {
+        email: participant.email
+      }
+    end
   end
 
   expose :issue_type,