diff options
Diffstat (limited to 'app/assets')
9 files changed, 18 insertions, 16 deletions
diff --git a/app/assets/javascripts/blob/notebook/index.js b/app/assets/javascripts/blob/notebook/index.js index 071022a9a75..35634d63e4a 100644 --- a/app/assets/javascripts/blob/notebook/index.js +++ b/app/assets/javascripts/blob/notebook/index.js @@ -75,10 +75,10 @@ export default () => { class="text-center" v-if="error"> <span v-if="loadError"> - An error occurred whilst loading the file. Please try again later. + An error occurred while loading the file. Please try again later. </span> <span v-else> - An error occurred whilst parsing the file. + An error occurred while parsing the file. </span> </p> </div> diff --git a/app/assets/javascripts/blob/pdf/index.js b/app/assets/javascripts/blob/pdf/index.js index 7d5f487c4ba..e9a0b3979e6 100644 --- a/app/assets/javascripts/blob/pdf/index.js +++ b/app/assets/javascripts/blob/pdf/index.js @@ -47,10 +47,10 @@ export default () => { class="text-center" v-if="error"> <span v-if="loadError"> - An error occurred whilst loading the file. Please try again later. + An error occurred while loading the file. Please try again later. </span> <span v-else> - An error occurred whilst decoding the file. + An error occurred while decoding the file. </span> </p> </div> diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 70a966afa66..76e09f96bd6 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -89,7 +89,7 @@ export const getFileData = ( .catch(() => { commit(types.TOGGLE_LOADING, { entry: file }); dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the file.'), + text: __('An error occurred while loading the file.'), action: payload => dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), @@ -136,7 +136,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) = }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the file content.'), + text: __('An error occurred while 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 806ec38430c..6144452c80b 100644 --- a/app/assets/javascripts/ide/stores/actions/merge_request.js +++ b/app/assets/javascripts/ide/stores/actions/merge_request.js @@ -58,7 +58,7 @@ export const getMergeRequestData = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the merge request.'), + text: __('An error occurred while loading the merge request.'), action: payload => dispatch('getMergeRequestData', payload).then(() => dispatch('setErrorMessage', null), @@ -91,7 +91,7 @@ export const getMergeRequestChanges = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the merge request changes.'), + text: __('An error occurred while loading the merge request changes.'), action: payload => dispatch('getMergeRequestChanges', payload).then(() => dispatch('setErrorMessage', null), @@ -125,7 +125,7 @@ export const getMergeRequestVersions = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the merge request version data.'), + text: __('An error occurred while 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 e206f9bee9e..d94dccad962 100644 --- a/app/assets/javascripts/ide/stores/actions/project.js +++ b/app/assets/javascripts/ide/stores/actions/project.js @@ -152,7 +152,7 @@ export const openBranch = ({ dispatch, state, getters }, { projectId, branchId, () => new Error( sprintf( - __('An error occurred whilst getting files for - %{branchId}'), + __('An error occurred while getting files for - %{branchId}'), { branchId: `<strong>${_.escape(projectId)}/${_.escape(branchId)}</strong>`, }, diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js index ba85194b910..828e4ed5eb9 100644 --- a/app/assets/javascripts/ide/stores/actions/tree.js +++ b/app/assets/javascripts/ide/stores/actions/tree.js @@ -77,7 +77,7 @@ export const getFiles = ({ state, commit, dispatch }, payload = {}) => }) .catch(e => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading all the files.'), + text: __('An error occurred while loading all the files.'), action: actionPayload => dispatch('getFiles', actionPayload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index e89ed49318b..73c1bc8b582 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js @@ -218,7 +218,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo dispatch( 'setErrorMessage', { - text: __('An error occurred whilst committing your changes.'), + text: __('An error occurred while committing your changes.'), action: () => dispatch('commitChanges').then(() => dispatch('setErrorMessage', null, { root: true }), diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js index 51cf4dede42..9862c556c2e 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js @@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => { dispatch( 'setErrorMessage', { - text: __('An error occurred whilst fetching the latest pipeline.'), + text: __('An error occurred while fetching the latest pipeline.'), action: () => dispatch('forcePipelineRequest').then(() => dispatch('setErrorMessage', null, { root: true }), @@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => { dispatch( 'setErrorMessage', { - text: __('An error occurred whilst loading the pipelines jobs.'), + text: __('An error occurred while 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 occurred whilst fetching the job trace.'), + text: __('An error occurred while fetching the job trace.'), action: () => dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })), actionText: __('Please try again'), diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index b03ee12aef3..2c51252be39 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -370,7 +370,9 @@ export default { > <gl-dropdown id="monitor-environments-dropdown" - class="mb-0 d-flex js-environments-dropdown" + ref="monitorEnvironmentsDropdown" + data-qa-selector="environments_dropdown" + class="mb-0 d-flex" toggle-class="dropdown-menu-toggle" :text="currentEnvironmentName" :disabled="environments.length === 0" |