Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

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,
             })) || []
         );
       },