Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 34 deletions

diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index 84007fd4510..d209a971c39 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -266,7 +266,6 @@ class GfmAutoComplete {
       },
       // eslint-disable-next-line no-template-curly-in-string
       insertTpl: '${atwho-at}${username}',
-      limit: 10,
       searchKey: 'search',
       alwaysHighlightFirst: true,
       skipSpecialCharacterTest: true,
@@ -312,31 +311,6 @@ class GfmAutoComplete {
 
           return data;
         },
-        sorter(query, items) {
-          if (!query) {
-            return items;
-          }
-
-          const lowercaseQuery = query.toLowerCase();
-          const members = items.slice();
-          const { nameOrUsernameStartsWith, nameOrUsernameIncludes } = GfmAutoComplete.Members;
-
-          return members.sort((a, b) => {
-            if (nameOrUsernameStartsWith(a, lowercaseQuery)) {
-              return -1;
-            }
-            if (nameOrUsernameStartsWith(b, lowercaseQuery)) {
-              return 1;
-            }
-            if (nameOrUsernameIncludes(a, lowercaseQuery)) {
-              return -1;
-            }
-            if (nameOrUsernameIncludes(b, lowercaseQuery)) {
-              return 1;
-            }
-            return 0;
-          });
-        },
       },
     });
   }
@@ -798,14 +772,6 @@ GfmAutoComplete.Members = {
       title,
     )}${availabilityStatus}</small> ${icon}</li>`;
   },
-  nameOrUsernameStartsWith(member, query) {
-    // `member.search` is a name:username string like `MargeSimpson msimpson`
-    return member.search.split(' ').some((name) => name.toLowerCase().startsWith(query));
-  },
-  nameOrUsernameIncludes(member, query) {
-    // `member.search` is a name:username string like `MargeSimpson msimpson`
-    return member.search.toLowerCase().includes(query);
-  },
 };
 GfmAutoComplete.Labels = {
   templateFunction(color, title) {