From 9a8093da816c96e2bab9812c2f00ef276270793b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 29 Aug 2023 15:10:34 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../vue_shared/components/user_select/user_select.vue          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/assets/javascripts/vue_shared/components/user_select/user_select.vue')

diff --git a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
index 4879baced0d..1e79d2cdcd7 100644
--- a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
+++ b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
@@ -130,11 +130,11 @@ export default {
       },
       update(data) {
         return (
-          data.workspace?.users?.nodes
-            .filter((x) => x?.user)
-            .map((node) => ({
-              ...node.user,
-              canMerge: node.mergeRequestInteraction?.canMerge || false,
+          data.workspace?.users
+            .filter((user) => user)
+            .map((user) => ({
+              ...user,
+              canMerge: user.mergeRequestInteraction?.canMerge || false,
             })) || []
         );
       },
-- 
cgit v1.2.3

