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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
e73b9812
Commit
e73b9812
authored
Apr 24, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update import on actions file to fix conflict when rewire plugin was added
parent
1aa11de1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
spec/javascripts/ide/stores/actions_spec.js
spec/javascripts/ide/stores/actions_spec.js
+2
-2
No files found.
spec/javascripts/ide/stores/actions_spec.js
View file @
e73b9812
import
actions
,
{
stageAllChanges
,
unstageAllChanges
}
from
'
~/ide/stores/actions
'
;
import
actions
,
{
stageAllChanges
,
unstageAllChanges
,
toggleFileFinder
}
from
'
~/ide/stores/actions
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
*
as
types
from
'
~/ide/stores/mutation_types
'
;
import
*
as
types
from
'
~/ide/stores/mutation_types
'
;
import
router
from
'
~/ide/ide_router
'
;
import
router
from
'
~/ide/ide_router
'
;
...
@@ -343,7 +343,7 @@ describe('Multi-file store actions', () => {
...
@@ -343,7 +343,7 @@ describe('Multi-file store actions', () => {
describe
(
'
toggleFileFinder
'
,
()
=>
{
describe
(
'
toggleFileFinder
'
,
()
=>
{
it
(
'
commits TOGGLE_FILE_FINDER
'
,
done
=>
{
it
(
'
commits TOGGLE_FILE_FINDER
'
,
done
=>
{
testAction
(
testAction
(
actions
.
toggleFileFinder
,
toggleFileFinder
,
true
,
true
,
null
,
null
,
[{
type
:
'
TOGGLE_FILE_FINDER
'
,
payload
:
true
}],
[{
type
:
'
TOGGLE_FILE_FINDER
'
,
payload
:
true
}],
...
...
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