diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-16 00:34:24 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-16 00:34:24 +0900 |
| commit | b689b20f20f1a3773ba88cfb2f4d355d90389145 (patch) | |
| tree | 23854becb2df93fffefd48ab3600dcd16b724f19 /app/assets/javascripts/ide/stores/actions | |
| parent | f3c44f640a0644590485d61d36ad222b343ec139 (diff) | |
| download | gitlab-ce-b689b20f20f1a3773ba88cfb2f4d355d90389145.tar.gz | |
Fix typos occured to occurred
Diffstat (limited to 'app/assets/javascripts/ide/stores/actions')
4 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 30dcf7ef4df..05e28a156ad 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -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 occurred 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 occurred whilst loading the file content.'), action: payload => dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js index 3ac2f8b3698..fdea30cc03f 100644 --- a/app/assets/javascripts/ide/stores/actions/merge_request.js +++ b/app/assets/javascripts/ide/stores/actions/merge_request.js @@ -25,7 +25,7 @@ export const getMergeRequestData = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occured whilst loading the merge request.'), + text: __('An error occurred 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 occurred 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 occurred whilst loading the merge request version data.'), action: payload => dispatch('getMergeRequestVersions', payload).then(() => dispatch('setErrorMessage', null), diff --git a/app/assets/javascripts/ide/stores/actions/project.js b/app/assets/javascripts/ide/stores/actions/project.js index 2cb08ab2945..b65f631c99c 100644 --- a/app/assets/javascripts/ide/stores/actions/project.js +++ b/app/assets/javascripts/ide/stores/actions/project.js @@ -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 occurred creating the new branch.'), action: payload => dispatch('createNewBranchFromDefault', payload), actionText: __('Please try again'), actionPayload: branch, diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js index 9288bbe32f5..de5f6050074 100644 --- a/app/assets/javascripts/ide/stores/actions/tree.js +++ b/app/assets/javascripts/ide/stores/actions/tree.js @@ -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 occurred whilst loading all the files.'), action: payload => dispatch('getFiles', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), |