Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d41f0990
Commit
d41f0990
authored
Dec 05, 2019
by
Winnie Hellmann
Committed by
Martin Wortschack
Dec 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicate import from gfm_auto_complete_spec.js
parent
7a14c495
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
ee/app/assets/javascripts/gfm_auto_complete.js
ee/app/assets/javascripts/gfm_auto_complete.js
+3
-3
spec/frontend/gfm_auto_complete_spec.js
spec/frontend/gfm_auto_complete_spec.js
+1
-2
No files found.
ee/app/assets/javascripts/gfm_auto_complete.js
View file @
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
)
{
...
...
spec/frontend/gfm_auto_complete_spec.js
View file @
d41f0990
/* 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
'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment