Commit 1109cbe5 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'winh-fix-eslint-import-no-duplicates' into 'master'

Remove duplicate import from gfm_auto_complete_spec.js

See merge request gitlab-org/gitlab!21233
parents 7a14c495 d41f0990
...@@ -4,10 +4,10 @@ import GfmAutoComplete from '~/gfm_auto_complete'; ...@@ -4,10 +4,10 @@ import GfmAutoComplete from '~/gfm_auto_complete';
/** /**
* This is added to keep the export parity with the CE counterpart. * This is added to keep the export parity with the CE counterpart.
* *
* Some modules import `defaultAutocompleteConfig` which will be undefined * Some modules import `defaultAutocompleteConfig` or `membersBeforeSave`
* if not exported from here in EE. * which will be undefined if not exported from here in EE.
*/ */
export { defaultAutocompleteConfig } from '~/gfm_auto_complete'; export { defaultAutocompleteConfig, membersBeforeSave } from '~/gfm_auto_complete';
class GfmAutoCompleteEE extends GfmAutoComplete { class GfmAutoCompleteEE extends GfmAutoComplete {
setupAtWho($input) { setupAtWho($input) {
......
/* eslint no-param-reassign: "off" */ /* eslint no-param-reassign: "off" */
import $ from 'jquery'; import $ from 'jquery';
import { membersBeforeSave } from '~/gfm_auto_complete'; import GfmAutoComplete, { membersBeforeSave } from 'ee_else_ce/gfm_auto_complete';
import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
import 'jquery.caret'; import 'jquery.caret';
import 'at.js'; import 'at.js';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment