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
Léo-Paul Géneau
gitlab-ce
Commits
b689b20f
Commit
b689b20f
authored
Nov 16, 2018
by
Hiroyuki Sato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos occured to occurred
parent
f3c44f64
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
25 additions
and
25 deletions
+25
-25
app/assets/javascripts/ci_variable_list/ajax_variable_list.js
...assets/javascripts/ci_variable_list/ajax_variable_list.js
+1
-1
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+2
-2
app/assets/javascripts/ide/stores/actions/merge_request.js
app/assets/javascripts/ide/stores/actions/merge_request.js
+3
-3
app/assets/javascripts/ide/stores/actions/project.js
app/assets/javascripts/ide/stores/actions/project.js
+1
-1
app/assets/javascripts/ide/stores/actions/tree.js
app/assets/javascripts/ide/stores/actions/tree.js
+1
-1
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
...ssets/javascripts/ide/stores/modules/pipelines/actions.js
+3
-3
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
...luster_dropdowns/components/gke_machine_type_dropdown.vue
+1
-1
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
..._cluster_dropdowns/components/gke_project_id_dropdown.vue
+1
-1
scripts/frontend/prettier.js
scripts/frontend/prettier.js
+1
-1
spec/features/issues/user_creates_branch_and_merge_request_spec.rb
...ures/issues/user_creates_branch_and_merge_request_spec.rb
+2
-2
spec/javascripts/ide/stores/actions/file_spec.js
spec/javascripts/ide/stores/actions/file_spec.js
+2
-2
spec/javascripts/ide/stores/actions/merge_request_spec.js
spec/javascripts/ide/stores/actions/merge_request_spec.js
+3
-3
spec/javascripts/ide/stores/actions/tree_spec.js
spec/javascripts/ide/stores/actions/tree_spec.js
+1
-1
spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
.../javascripts/ide/stores/modules/pipelines/actions_spec.js
+3
-3
No files found.
app/assets/javascripts/ci_variable_list/ajax_variable_list.js
View file @
b689b20f
...
...
@@ -84,7 +84,7 @@ export default class AjaxVariableList {
.
catch
(()
=>
{
loadingIcon
.
classList
.
toggle
(
'
hide
'
,
true
);
this
.
variableList
.
toggleEnableRow
(
true
);
Flash
(
s__
(
'
CiVariable|Error occured while saving variables
'
));
Flash
(
s__
(
'
CiVariable|Error occur
r
ed while saving variables
'
));
});
}
...
...
app/assets/javascripts/ide/stores/actions/file.js
View file @
b689b20f
...
...
@@ -79,7 +79,7 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive
.
catch
(()
=>
{
commit
(
types
.
TOGGLE_LOADING
,
{
entry
:
file
});
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading the file.
'
),
text
:
__
(
'
An error occur
r
ed whilst loading the file.
'
),
action
:
payload
=>
dispatch
(
'
getFileData
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
)),
actionText
:
__
(
'
Please try again
'
),
...
...
@@ -121,7 +121,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) =
})
.
catch
(()
=>
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading the file content.
'
),
text
:
__
(
'
An error occur
r
ed whilst loading the file content.
'
),
action
:
payload
=>
dispatch
(
'
getRawFileData
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
)),
actionText
:
__
(
'
Please try again
'
),
...
...
app/assets/javascripts/ide/stores/actions/merge_request.js
View file @
b689b20f
...
...
@@ -25,7 +25,7 @@ export const getMergeRequestData = (
})
.
catch
(()
=>
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading the merge request.
'
),
text
:
__
(
'
An error occur
r
ed whilst loading the merge request.
'
),
action
:
payload
=>
dispatch
(
'
getMergeRequestData
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
),
...
...
@@ -58,7 +58,7 @@ export const getMergeRequestChanges = (
})
.
catch
(()
=>
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading the merge request changes.
'
),
text
:
__
(
'
An error occur
r
ed whilst loading the merge request changes.
'
),
action
:
payload
=>
dispatch
(
'
getMergeRequestChanges
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
),
...
...
@@ -92,7 +92,7 @@ export const getMergeRequestVersions = (
})
.
catch
(()
=>
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading the merge request version data.
'
),
text
:
__
(
'
An error occur
r
ed whilst loading the merge request version data.
'
),
action
:
payload
=>
dispatch
(
'
getMergeRequestVersions
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
),
...
...
app/assets/javascripts/ide/stores/actions/project.js
View file @
b689b20f
...
...
@@ -103,7 +103,7 @@ export const createNewBranchFromDefault = ({ state, dispatch, getters }, branch)
})
.
catch
(()
=>
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured creating the new branch.
'
),
text
:
__
(
'
An error occur
r
ed creating the new branch.
'
),
action
:
payload
=>
dispatch
(
'
createNewBranchFromDefault
'
,
payload
),
actionText
:
__
(
'
Please try again
'
),
actionPayload
:
branch
,
...
...
app/assets/javascripts/ide/stores/actions/tree.js
View file @
b689b20f
...
...
@@ -76,7 +76,7 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
dispatch
(
'
showBranchNotFoundError
'
,
branchId
);
}
else
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading all the files.
'
),
text
:
__
(
'
An error occur
r
ed whilst loading all the files.
'
),
action
:
payload
=>
dispatch
(
'
getFiles
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
)),
actionText
:
__
(
'
Please try again
'
),
...
...
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
View file @
b689b20f
...
...
@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => {
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst fetching the latest pipline.
'
),
text
:
__
(
'
An error occur
r
ed whilst fetching the latest pipline.
'
),
action
:
()
=>
dispatch
(
'
forcePipelineRequest
'
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
,
{
root
:
true
}),
...
...
@@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => {
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst loading the pipelines jobs.
'
),
text
:
__
(
'
An error occur
r
ed whilst loading the pipelines jobs.
'
),
action
:
payload
=>
dispatch
(
'
fetchJobs
'
,
payload
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
,
{
root
:
true
}),
...
...
@@ -123,7 +123,7 @@ export const receiveJobTraceError = ({ commit, dispatch }) => {
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occured whilst fetching the job trace.
'
),
text
:
__
(
'
An error occur
r
ed whilst fetching the job trace.
'
),
action
:
()
=>
dispatch
(
'
fetchJobTrace
'
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
,
{
root
:
true
})),
actionText
:
__
(
'
Please try again
'
),
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
View file @
b689b20f
...
...
@@ -47,7 +47,7 @@ export default {
errorMessage
()
{
return
sprintf
(
s__
(
'
ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}
'
,
'
ClusterIntegration|An error occur
r
ed while trying to fetch zone machine types: %{error}
'
,
),
{
error
:
this
.
gapiError
},
);
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
View file @
b689b20f
...
...
@@ -93,7 +93,7 @@ export default {
}
return
sprintf
(
s__
(
'
ClusterIntegration|An error occured while trying to fetch your projects: %{error}
'
),
s__
(
'
ClusterIntegration|An error occur
r
ed while trying to fetch your projects: %{error}
'
),
{
error
:
this
.
gapiError
},
);
},
...
...
scripts/frontend/prettier.js
View file @
b689b20f
...
...
@@ -111,6 +111,6 @@ Promise.all(matchedFiles.map(checkFileWithPrettierConfig))
if
(
didWarn
)
process
.
exit
(
1
);
})
.
catch
(
e
=>
{
console
.
log
(
`\nAn error occured while processing files with prettier:
${
e
.
message
}
\n`
);
console
.
log
(
`\nAn error occur
r
ed while processing files with prettier:
${
e
.
message
}
\n`
);
process
.
exit
(
1
);
});
spec/features/issues/user_creates_branch_and_merge_request_spec.rb
View file @
b689b20f
...
...
@@ -55,11 +55,11 @@ describe 'User creates branch and merge request on issue page', :js do
test_branch_name_checking
(
input_branch_name
)
test_source_checking
(
input_source
)
# The button inside dropdown should be disabled if any errors occured.
# The button inside dropdown should be disabled if any errors occur
r
ed.
expect
(
page
).
to
have_button
(
'Create branch'
,
disabled:
true
)
end
# The top level button should be disabled if any errors occured.
# The top level button should be disabled if any errors occur
r
ed.
expect
(
page
).
to
have_button
(
'Create branch'
,
disabled:
true
)
end
...
...
spec/javascripts/ide/stores/actions/file_spec.js
View file @
b689b20f
...
...
@@ -296,7 +296,7 @@ describe('IDE store file actions', () => {
.
getFileData
({
state
:
store
.
state
,
commit
()
{},
dispatch
},
{
path
:
localFile
.
path
})
.
then
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
text
:
'
An error occured whilst loading the file.
'
,
text
:
'
An error occur
r
ed whilst loading the file.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
{
...
...
@@ -408,7 +408,7 @@ describe('IDE store file actions', () => {
.
then
(
done
.
fail
)
.
catch
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
text
:
'
An error occured whilst loading the file content.
'
,
text
:
'
An error occur
r
ed whilst loading the file content.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
{
...
...
spec/javascripts/ide/stores/actions/merge_request_spec.js
View file @
b689b20f
...
...
@@ -82,7 +82,7 @@ describe('IDE store merge request actions', () => {
.
then
(
done
.
fail
)
.
catch
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
text
:
'
An error occured whilst loading the merge request.
'
,
text
:
'
An error occur
r
ed whilst loading the merge request.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
{
...
...
@@ -155,7 +155,7 @@ describe('IDE store merge request actions', () => {
.
then
(
done
.
fail
)
.
catch
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
text
:
'
An error occured whilst loading the merge request changes.
'
,
text
:
'
An error occur
r
ed whilst loading the merge request changes.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
{
...
...
@@ -225,7 +225,7 @@ describe('IDE store merge request actions', () => {
.
then
(
done
.
fail
)
.
catch
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
text
:
'
An error occured whilst loading the merge request version data.
'
,
text
:
'
An error occur
r
ed whilst loading the merge request version data.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
{
...
...
spec/javascripts/ide/stores/actions/tree_spec.js
View file @
b689b20f
...
...
@@ -143,7 +143,7 @@ describe('Multi-file store tree actions', () => {
.
then
(
done
.
fail
)
.
catch
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
text
:
'
An error occured whilst loading all the files.
'
,
text
:
'
An error occur
r
ed whilst loading all the files.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
{
projectId
:
'
abc/def
'
,
branchId
:
'
master-testing
'
},
...
...
spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
View file @
b689b20f
...
...
@@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => {
{
type
:
'
setErrorMessage
'
,
payload
:
{
text
:
'
An error occured whilst fetching the latest pipline.
'
,
text
:
'
An error occur
r
ed whilst fetching the latest pipline.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
null
,
...
...
@@ -223,7 +223,7 @@ describe('IDE pipelines actions', () => {
{
type
:
'
setErrorMessage
'
,
payload
:
{
text
:
'
An error occured whilst loading the pipelines jobs.
'
,
text
:
'
An error occur
r
ed whilst loading the pipelines jobs.
'
,
action
:
jasmine
.
anything
(),
actionText
:
'
Please try again
'
,
actionPayload
:
{
id
:
1
},
...
...
@@ -360,7 +360,7 @@ describe('IDE pipelines actions', () => {
{
type
:
'
setErrorMessage
'
,
payload
:
{
text
:
'
An error occured whilst fetching the job trace.
'
,
text
:
'
An error occur
r
ed whilst fetching the job trace.
'
,
action
:
jasmine
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
null
,
...
...
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