Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 2 deletions

diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index 409733c73b9..bc3a130432a 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -34,6 +34,7 @@ export function membersBeforeSave(members) {
       : '';
 
     return {
+      type: member.type,
       username: member.username,
       avatarTag: autoCompleteAvatar.length === 1 ? txtAvatar : imgAvatar,
       title: sanitize(title),
@@ -275,9 +276,11 @@ class GfmAutoComplete {
             return $.fn.atwho.default.callbacks.filter(query, data, searchKey);
           }
 
-          if (command === MEMBER_COMMAND.ASSIGN) {
+          if (command === MEMBER_COMMAND.ASSIGN || command === MEMBER_COMMAND.REASSIGN) {
             // Only include members which are not assigned to Issuable currently
-            return data.filter(member => !assignees.includes(member.search));
+            return data.filter(
+              member => member.type === 'User' && !assignees.includes(member.search),
+            );
           } else if (command === MEMBER_COMMAND.UNASSIGN) {
             // Only include members which are assigned to Issuable currently
             return data.filter(member => assignees.includes(member.search));