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
8b687e07
Commit
8b687e07
authored
Jun 28, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✅
fixed eslint
parent
bfc7ef1e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+1
-1
app/assets/javascripts/ide/stores/actions/merge_request.js
app/assets/javascripts/ide/stores/actions/merge_request.js
+4
-3
app/assets/javascripts/ide/stores/actions/tree.js
app/assets/javascripts/ide/stores/actions/tree.js
+2
-2
spec/javascripts/ide/stores/actions/tree_spec.js
spec/javascripts/ide/stores/actions/tree_spec.js
+0
-1
No files found.
app/assets/javascripts/ide/stores/actions/file.js
View file @
8b687e07
...
@@ -94,7 +94,7 @@ export const setFileMrChange = ({ commit }, { file, mrChange }) => {
...
@@ -94,7 +94,7 @@ export const setFileMrChange = ({ commit }, { file, mrChange }) => {
commit
(
types
.
SET_FILE_MERGE_REQUEST_CHANGE
,
{
file
,
mrChange
});
commit
(
types
.
SET_FILE_MERGE_REQUEST_CHANGE
,
{
file
,
mrChange
});
};
};
export
const
getRawFileData
=
({
state
,
commit
},
{
path
,
baseSha
})
=>
{
export
const
getRawFileData
=
({
state
,
commit
,
dispatch
},
{
path
,
baseSha
})
=>
{
const
file
=
state
.
entries
[
path
];
const
file
=
state
.
entries
[
path
];
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
service
service
...
...
app/assets/javascripts/ide/stores/actions/merge_request.js
View file @
8b687e07
import
{
__
}
from
'
../../../locale
'
;
import
service
from
'
../../services
'
;
import
service
from
'
../../services
'
;
import
*
as
types
from
'
../mutation_types
'
;
import
*
as
types
from
'
../mutation_types
'
;
export
const
getMergeRequestData
=
(
export
const
getMergeRequestData
=
(
{
commit
,
state
},
{
commit
,
dispatch
,
state
},
{
projectId
,
mergeRequestId
,
force
=
false
}
=
{},
{
projectId
,
mergeRequestId
,
force
=
false
}
=
{},
)
=>
)
=>
new
Promise
((
resolve
,
reject
)
=>
{
new
Promise
((
resolve
,
reject
)
=>
{
...
@@ -37,7 +38,7 @@ export const getMergeRequestData = (
...
@@ -37,7 +38,7 @@ export const getMergeRequestData = (
});
});
export
const
getMergeRequestChanges
=
(
export
const
getMergeRequestChanges
=
(
{
commit
,
state
},
{
commit
,
dispatch
,
state
},
{
projectId
,
mergeRequestId
,
force
=
false
}
=
{},
{
projectId
,
mergeRequestId
,
force
=
false
}
=
{},
)
=>
)
=>
new
Promise
((
resolve
,
reject
)
=>
{
new
Promise
((
resolve
,
reject
)
=>
{
...
@@ -71,7 +72,7 @@ export const getMergeRequestChanges = (
...
@@ -71,7 +72,7 @@ export const getMergeRequestChanges = (
});
});
export
const
getMergeRequestVersions
=
(
export
const
getMergeRequestVersions
=
(
{
commit
,
state
},
{
commit
,
dispatch
,
state
},
{
projectId
,
mergeRequestId
,
force
=
false
}
=
{},
{
projectId
,
mergeRequestId
,
force
=
false
}
=
{},
)
=>
)
=>
new
Promise
((
resolve
,
reject
)
=>
{
new
Promise
((
resolve
,
reject
)
=>
{
...
...
app/assets/javascripts/ide/stores/actions/tree.js
View file @
8b687e07
...
@@ -80,9 +80,9 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
...
@@ -80,9 +80,9 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
dispatch
(
'
setErrorMessage
'
,
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading all the files.
'
),
text
:
__
(
'
An error occured whilst loading all the files.
'
),
action
:
payload
=>
action
:
payload
=>
dispatch
(
'
get
RawFileData
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
)),
dispatch
(
'
get
Files
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
)),
actionText
:
__
(
'
Please try again
'
),
actionText
:
__
(
'
Please try again
'
),
actionPayload
:
{
p
ath
,
baseSha
},
actionPayload
:
{
p
rojectId
,
branchId
},
});
});
}
}
reject
(
e
);
reject
(
e
);
...
...
spec/javascripts/ide/stores/actions/tree_spec.js
View file @
8b687e07
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
Vue
from
'
vue
'
;
import
testAction
from
'
spec/helpers/vuex_action_helper
'
;
import
testAction
from
'
spec/helpers/vuex_action_helper
'
;
import
{
showTreeEntry
,
getFiles
}
from
'
~/ide/stores/actions/tree
'
;
import
{
showTreeEntry
,
getFiles
}
from
'
~/ide/stores/actions/tree
'
;
import
*
as
types
from
'
~/ide/stores/mutation_types
'
;
import
*
as
types
from
'
~/ide/stores/mutation_types
'
;
...
...
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