Merge branch...

Merge branch '264441-revert-add-special-reference-for-vulnerabilities-on-frontend' into 264441-revert-special-references-for-vulnerabilities

app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js

@@ -14,7 +14,6 @@ export default function initGFMInput($els) {
       milestones: enableGFM,
       mergeRequests: enableGFM,
       labels: enableGFM,
-      vulnerabilities: enableGFM,
     });
   });
 }

app/assets/javascripts/gfm_auto_complete.js

@@ -52,7 +52,6 @@ export const defaultAutocompleteConfig = {
   milestones: true,
   labels: true,
   snippets: true,
-  vulnerabilities: true,
 };
 
 class GfmAutoComplete {
@@ -708,8 +707,7 @@ class GfmAutoComplete {
     // https://github.com/ichord/At.js
     const atSymbolsWithBar = Object.keys(controllers)
       .join('|')
-      .replace(/[$]/, '\\$&')
-      .replace(/[+]/, '\\+');
+      .replace(/[$]/, '\\$&');
     const atSymbolsWithoutBar = Object.keys(controllers).join('');
     const targetSubtext = subtext.split(GfmAutoComplete.regexSubtext).pop();
     const resultantFlag = flag.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
@@ -740,7 +738,6 @@ GfmAutoComplete.atTypeMap = {
   '~': 'labels',
   '%': 'milestones',
   '/': 'commands',
-  '+': 'vulnerabilities',
   $: 'snippets',
 };
 

app/assets/javascripts/shared/milestones/form.js

@@ -16,6 +16,5 @@ export default (initGFM = true) => {
     milestones: initGFM,
     labels: initGFM,
     snippets: initGFM,
-    vulnerabilities: initGFM,
   });
 };

app/assets/javascripts/vue_shared/components/markdown/field.vue

@@ -178,7 +178,6 @@ export default {
         milestones: this.enableAutocomplete,
         labels: this.enableAutocomplete && !this.glFeatures.tributeAutocomplete,
         snippets: this.enableAutocomplete,
-        vulnerabilities: this.enableAutocomplete,
       },
       true,
     );

ee/app/assets/javascripts/gfm_auto_complete.js

@@ -16,10 +16,6 @@ class GfmAutoCompleteEE extends GfmAutoComplete {
       this.setupAutoCompleteEpics($input, this.getDefaultCallbacks());
     }
 
-    if (this.enableMap.vulnerabilities) {
-      this.setupAutoCompleteVulnerabilities($input, this.getDefaultCallbacks());
-    }
-
     super.setupAtWho($input);
   }
 
@@ -55,40 +51,6 @@ class GfmAutoCompleteEE extends GfmAutoComplete {
       },
     });
   };
-
-  setupAutoCompleteVulnerabilities = ($input, defaultCallbacks) => {
-    $input.atwho({
-      at: '+',
-      alias: 'vulnerabilities',
-      searchKey: 'search',
-      displayTpl(value) {
-        let tmpl = GfmAutoComplete.Loading.template;
-        if (value.title != null) {
-          tmpl = GfmAutoComplete.Issues.templateFunction(value);
-        }
-        return tmpl;
-      },
-      data: GfmAutoComplete.defaultLoadingData,
-      insertTpl: GfmAutoComplete.Issues.insertTemplateFunction,
-      skipSpecialCharacterTest: true,
-      callbacks: {
-        ...defaultCallbacks,
-        beforeSave(merges) {
-          return merges.map(m => {
-            if (m.title == null) {
-              return m;
-            }
-            return {
-              id: m.id,
-              title: m.title.replace(/<(?:.|\n)*?>/gm, ''),
-              reference: m.reference,
-              search: `${m.id} ${m.title}`,
-            };
-          });
-        },
-      },
-    });
-  };
 }
 
 export default GfmAutoCompleteEE;

spec/frontend/gfm_auto_complete_spec.js

@@ -120,7 +120,7 @@ describe('GfmAutoComplete', () => {
     const defaultMatcher = (context, flag, subtext) =>
       gfmAutoCompleteCallbacks.matcher.call(context, flag, subtext);
 
-    const flagsUseDefaultMatcher = ['@', '#', '!', '~', '%', '$', '+'];
+    const flagsUseDefaultMatcher = ['@', '#', '!', '~', '%', '$'];
     const otherFlags = ['/', ':'];
     const flags = flagsUseDefaultMatcher.concat(otherFlags);
 
@@ -154,6 +154,7 @@ describe('GfmAutoComplete', () => {
       'я',
       '.',
       "'",
+      '+',
       '-',
       '_',
     ];