diff options
25 files changed, 119 insertions, 162 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb37b60b8f3..617c5c084b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -619,6 +619,11 @@ gitlab:assets:compile: paths: - webpack-report/ - public/assets/ + only: + - branches@gitlab-org/gitlab-ce + - branches@gitlab-org/gitlab-ee + - tags@gitlab-org/gitlab-ce + - tags@gitlab-org/gitlab-ee tags: - gitlab-org-delivery - high-cpu diff --git a/app/assets/javascripts/ci_variable_list/ajax_variable_list.js b/app/assets/javascripts/ci_variable_list/ajax_variable_list.js index c7a917457f3..dffabbfe1b8 100644 --- a/app/assets/javascripts/ci_variable_list/ajax_variable_list.js +++ b/app/assets/javascripts/ci_variable_list/ajax_variable_list.js @@ -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 occurred while saving variables')); }); } diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 0b7838292b2..22da38ce7a5 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -55,8 +55,6 @@ export default { diffViewType: state => state.diffs.diffViewType, mergeRequestDiffs: state => state.diffs.mergeRequestDiffs, mergeRequestDiff: state => state.diffs.mergeRequestDiff, - latestVersionPath: state => state.diffs.latestVersionPath, - startVersion: state => state.diffs.startVersion, commit: state => state.diffs.commit, targetBranchName: state => state.diffs.targetBranchName, renderOverflowWarning: state => state.diffs.renderOverflowWarning, @@ -75,24 +73,6 @@ export default { path: '', }; }, - notAllCommentsDisplayed() { - if (this.commit) { - return __('Only comments from the following commit are shown below'); - } else if (this.startVersion) { - return __( - "Not all comments are displayed because you're comparing two versions of the diff.", - ); - } - return __( - "Not all comments are displayed because you're viewing an old version of the diff.", - ); - }, - showLatestVersion() { - if (this.commit) { - return __('Show latest version of the diff'); - } - return __('Show latest version'); - }, canCurrentUserFork() { return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request; }, @@ -184,10 +164,8 @@ export default { <div v-if="isLoading" class="loading"><gl-loading-icon /></div> <div v-else id="diffs" :class="{ active: shouldShow }" class="diffs tab-pane"> <compare-versions - v-if="showCompareVersions" :merge-request-diffs="mergeRequestDiffs" :merge-request-diff="mergeRequestDiff" - :start-version="startVersion" :target-branch="targetBranch" /> @@ -200,33 +178,22 @@ export default { /> <div - v-if="commit || startVersion || (mergeRequestDiff && !mergeRequestDiff.latest)" - class="mr-version-controls" - > - <div class="content-block comments-disabled-notif clearfix"> - <i class="fa fa-info-circle"></i> {{ notAllCommentsDisplayed }} - <div class="pull-right"> - <a :href="latestVersionPath" class="btn btn-sm"> {{ showLatestVersion }} </a> - </div> - </div> - </div> - - <commit-widget v-if="commit" :commit="commit" /> - - <div :data-can-create-note="getNoteableData.current_user.can_create_note" class="files d-flex prepend-top-default" > <div v-show="showTreeList" class="diff-tree-list"><tree-list /></div> - <div v-if="diffFiles.length > 0" class="diff-files-holder"> - <diff-file - v-for="file in diffFiles" - :key="file.newPath" - :file="file" - :can-current-user-fork="canCurrentUserFork" - /> + <div class="diff-files-holder"> + <commit-widget v-if="commit" :commit="commit" /> + <template v-if="diffFiles.length > 0"> + <diff-file + v-for="file in diffFiles" + :key="file.newPath" + :file="file" + :can-current-user-fork="canCurrentUserFork" + /> + </template> + <no-changes v-else /> </div> - <no-changes v-else /> </div> </div> </div> diff --git a/app/assets/javascripts/diffs/components/commit_widget.vue b/app/assets/javascripts/diffs/components/commit_widget.vue index 3fb11813d68..d45f91c7023 100644 --- a/app/assets/javascripts/diffs/components/commit_widget.vue +++ b/app/assets/javascripts/diffs/components/commit_widget.vue @@ -28,7 +28,7 @@ export default { </script> <template> - <div class="info-well prepend-top-default"> + <div class="info-well w-100"> <div class="well-segment"> <ul class="blob-commit-info"> <commit-item :commit="commit" /> diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue index 3ccd111f1cb..f75345d31f8 100644 --- a/app/assets/javascripts/diffs/components/compare_versions.vue +++ b/app/assets/javascripts/diffs/components/compare_versions.vue @@ -1,6 +1,6 @@ <script> import { mapActions, mapGetters, mapState } from 'vuex'; -import { GlTooltipDirective } from '@gitlab/ui'; +import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui'; import { __ } from '~/locale'; import { getParameterValues, mergeUrlParams } from '~/lib/utils/url_utility'; import Icon from '~/vue_shared/components/icon.vue'; @@ -10,6 +10,8 @@ export default { components: { CompareVersionsDropdown, Icon, + GlLink, + GlButton, }, directives: { GlTooltip: GlTooltipDirective, @@ -21,12 +23,8 @@ export default { }, mergeRequestDiff: { type: Object, - required: true, - }, - startVersion: { - type: Object, required: false, - default: null, + default: () => ({}), }, targetBranch: { type: Object, @@ -35,7 +33,7 @@ export default { }, }, computed: { - ...mapState('diffs', ['commit', 'showTreeList']), + ...mapState('diffs', ['commit', 'showTreeList', 'startVersion', 'latestVersionPath']), ...mapGetters('diffs', ['isInlineView', 'isParallelView', 'hasCollapsedFile']), comparableDiffs() { return this.mergeRequestDiffs.slice(1); @@ -102,7 +100,18 @@ export default { class="mr-version-compare-dropdown" /> </div> + <div v-else-if="commit"> + {{ __('Viewing commit') }} + <gl-link :href="commit.commit_url" class="monospace">{{ commit.short_id }}</gl-link> + </div> <div class="inline-parallel-buttons d-none d-md-flex ml-auto"> + <gl-button + v-if="commit || startVersion" + :href="latestVersionPath" + class="append-right-8 js-latest-version" + > + {{ __('Show latest version') }} + </gl-button> <a v-show="hasCollapsedFile" class="btn btn-default append-right-8" @click="expandAllFiles"> {{ __('Expand all') }} </a> diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index a297740bd5f..e74b880e02c 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -82,7 +82,7 @@ export const getFileData = ( .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'), @@ -124,7 +124,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 8404c6d4f72..18c24369996 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'), diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js index ea2525a2f0e..51cf4dede42 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 occured whilst fetching the latest pipeline.'), + text: __('An error occurred whilst 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 occured whilst loading the pipelines jobs.'), + text: __('An error occurred 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 occurred whilst fetching the job trace.'), action: () => dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })), actionText: __('Please try again'), diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 78f085e5312..21095fcba16 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -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 occurred while trying to fetch zone machine types: %{error}', ), { error: this.gapiError }, ); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 8e51dd352c7..056584c8865 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -93,7 +93,7 @@ export default { } return sprintf( - s__('ClusterIntegration|An error occured while trying to fetch your projects: %{error}'), + s__('ClusterIntegration|An error occurred while trying to fetch your projects: %{error}'), { error: this.gapiError }, ); }, diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 415583cc1c7..78c5ae9ae63 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -22,7 +22,6 @@ .detail-page-header, .page-content-header, .commit-box, - .info-well, .commit-ci-menu, .files-changed-inner, .limited-header-width, diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index fa6afbf81de..b075009b57c 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -717,6 +717,7 @@ .mr-version-menus-container { display: flex; align-items: center; + flex-wrap: wrap; padding: 16px; z-index: 199; white-space: nowrap; diff --git a/changelogs/unreleased/mr-file-tree-commit.yml b/changelogs/unreleased/mr-file-tree-commit.yml new file mode 100644 index 00000000000..e0d47e6e61f --- /dev/null +++ b/changelogs/unreleased/mr-file-tree-commit.yml @@ -0,0 +1,5 @@ +--- +title: Show tree collapse button for merge request commit diffs +merge_request: +author: +type: fixed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7af36b049d8..ff4fd0c8aec 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -498,34 +498,7 @@ msgstr "" msgid "An error has occurred" msgstr "" -msgid "An error occured creating the new branch." -msgstr "" - -msgid "An error occured whilst fetching the job trace." -msgstr "" - -msgid "An error occured whilst fetching the latest pipeline." -msgstr "" - -msgid "An error occured whilst loading all the files." -msgstr "" - -msgid "An error occured whilst loading the file content." -msgstr "" - -msgid "An error occured whilst loading the file." -msgstr "" - -msgid "An error occured whilst loading the merge request changes." -msgstr "" - -msgid "An error occured whilst loading the merge request version data." -msgstr "" - -msgid "An error occured whilst loading the merge request." -msgstr "" - -msgid "An error occured whilst loading the pipelines jobs." +msgid "An error occurred creating the new branch." msgstr "" msgid "An error occurred previewing the blob" @@ -603,6 +576,33 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" +msgid "An error occurred whilst fetching the job trace." +msgstr "" + +msgid "An error occurred whilst fetching the latest pipeline." +msgstr "" + +msgid "An error occurred whilst loading all the files." +msgstr "" + +msgid "An error occurred whilst loading the file content." +msgstr "" + +msgid "An error occurred whilst loading the file." +msgstr "" + +msgid "An error occurred whilst loading the merge request changes." +msgstr "" + +msgid "An error occurred whilst loading the merge request version data." +msgstr "" + +msgid "An error occurred whilst loading the merge request." +msgstr "" + +msgid "An error occurred whilst loading the pipelines jobs." +msgstr "" + msgid "An error occurred. Please try again." msgstr "" @@ -1316,7 +1316,7 @@ msgstr "" msgid "CiVariable|All environments" msgstr "" -msgid "CiVariable|Error occured while saving variables" +msgid "CiVariable|Error occurred while saving variables" msgstr "" msgid "CiVariable|Protected" @@ -1397,13 +1397,13 @@ msgstr "" msgid "ClusterIntegration|An error occured while trying to fetch project zones: %{error}" msgstr "" -msgid "ClusterIntegration|An error occured while trying to fetch your projects: %{error}" +msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later." msgstr "" -msgid "ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}" +msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}" msgstr "" -msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later." +msgid "ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}" msgstr "" msgid "ClusterIntegration|Applications" @@ -4252,12 +4252,6 @@ msgstr "" msgid "None" msgstr "" -msgid "Not all comments are displayed because you're comparing two versions of the diff." -msgstr "" - -msgid "Not all comments are displayed because you're viewing an old version of the diff." -msgstr "" - msgid "Not allowed to merge" msgstr "" @@ -4395,9 +4389,6 @@ msgstr "" msgid "Only admins" msgstr "" -msgid "Only comments from the following commit are shown below" -msgstr "" - msgid "Only mirror protected branches" msgstr "" @@ -5764,9 +5755,6 @@ msgstr "" msgid "Show latest version" msgstr "" -msgid "Show latest version of the diff" -msgstr "" - msgid "Show parent pages" msgstr "" @@ -7053,6 +7041,9 @@ msgstr "" msgid "View the documentation" msgstr "" +msgid "Viewing commit" +msgstr "" + msgid "Visibility and access controls" msgstr "" diff --git a/scripts/frontend/prettier.js b/scripts/frontend/prettier.js index ce86a9f4601..ffb09ea9779 100644 --- a/scripts/frontend/prettier.js +++ b/scripts/frontend/prettier.js @@ -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 occurred while processing files with prettier: ${e.message}\n`); process.exit(1); }); diff --git a/scripts/trigger-build b/scripts/trigger-build index 873c41db456..d02acd01a2a 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -106,6 +106,7 @@ module Trigger def extra_variables { 'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'], + 'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'], 'ALTERNATIVE_SOURCES' => 'true', 'ee' => Trigger.ee? ? 'true' : 'false', 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master' diff --git a/spec/features/merge_request/user_sees_versions_spec.rb b/spec/features/merge_request/user_sees_versions_spec.rb index 92db4f44098..f7512294bef 100644 --- a/spec/features/merge_request/user_sees_versions_spec.rb +++ b/spec/features/merge_request/user_sees_versions_spec.rb @@ -66,7 +66,6 @@ describe 'Merge request > User sees versions', :js do it 'shows comments that were last relevant at that version' do expect(page).to have_content '5 changed files' - expect(page).to have_content 'Not all comments are displayed' position = Gitlab::Diff::Position.new( old_path: ".gitmodules", @@ -112,7 +111,6 @@ describe 'Merge request > User sees versions', :js do ) expect(page).to have_content '4 changed files' expect(page).to have_content '15 additions 6 deletions' - expect(page).to have_content 'Not all comments are displayed' position = Gitlab::Diff::Position.new( old_path: ".gitmodules", diff --git a/spec/javascripts/diffs/components/app_spec.js b/spec/javascripts/diffs/components/app_spec.js index 3c9b5ee0176..1a0b7612ee9 100644 --- a/spec/javascripts/diffs/components/app_spec.js +++ b/spec/javascripts/diffs/components/app_spec.js @@ -3,7 +3,6 @@ import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper import { TEST_HOST } from 'spec/test_constants'; import App from '~/diffs/components/app.vue'; import createDiffsStore from '../create_diffs_store'; -import getDiffWithCommit from '../mock_data/diff_with_commit'; describe('diffs/components/app', () => { const oldMrTabs = window.mrTabs; @@ -40,43 +39,4 @@ describe('diffs/components/app', () => { it('does not show commit info', () => { expect(vm.$el).not.toContainElement('.blob-commit-info'); }); - - it('shows comments message, with commit', done => { - vm.$store.state.diffs.commit = getDiffWithCommit().commit; - - vm.$nextTick() - .then(() => { - expect(vm.$el).toContainText('Only comments from the following commit are shown below'); - expect(vm.$el).toContainElement('.blob-commit-info'); - }) - .then(done) - .catch(done.fail); - }); - - it('shows comments message, with old mergeRequestDiff', done => { - vm.$store.state.diffs.mergeRequestDiff = { latest: false }; - vm.$store.state.diffs.targetBranch = 'master'; - - vm.$nextTick() - .then(() => { - expect(vm.$el).toContainText( - "Not all comments are displayed because you're viewing an old version of the diff.", - ); - }) - .then(done) - .catch(done.fail); - }); - - it('shows comments message, with startVersion', done => { - vm.$store.state.diffs.startVersion = 'test'; - - vm.$nextTick() - .then(() => { - expect(vm.$el).toContainText( - "Not all comments are displayed because you're comparing two versions of the diff.", - ); - }) - .then(done) - .catch(done.fail); - }); }); diff --git a/spec/javascripts/diffs/components/compare_versions_spec.js b/spec/javascripts/diffs/components/compare_versions_spec.js index d9d7f61785f..75c66e9ca82 100644 --- a/spec/javascripts/diffs/components/compare_versions_spec.js +++ b/spec/javascripts/diffs/components/compare_versions_spec.js @@ -3,6 +3,7 @@ import CompareVersionsComponent from '~/diffs/components/compare_versions.vue'; import store from '~/mr_notes/stores'; import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import diffsMockData from '../mock_data/merge_request_diffs'; +import getDiffWithCommit from '../mock_data/diff_with_commit'; describe('CompareVersions', () => { let vm; @@ -122,4 +123,24 @@ describe('CompareVersions', () => { expect(vm.isWhitespaceVisible()).toBe(true); }); }); + + describe('commit', () => { + beforeEach(done => { + vm.$store.state.diffs.commit = getDiffWithCommit().commit; + vm.mergeRequestDiffs = []; + + vm.$nextTick(done); + }); + + it('renders latest version button', () => { + expect(vm.$el.querySelector('.js-latest-version').textContent.trim()).toBe( + 'Show latest version', + ); + }); + + it('renders short commit ID', () => { + expect(vm.$el.textContent).toContain('Viewing commit'); + expect(vm.$el.textContent).toContain(vm.commit.short_id); + }); + }); }); diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js index 1ca811e996b..7ddc734ff56 100644 --- a/spec/javascripts/ide/stores/actions/file_spec.js +++ b/spec/javascripts/ide/stores/actions/file_spec.js @@ -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 occurred 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 occurred whilst loading the file content.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/javascripts/ide/stores/actions/merge_request_spec.js index d8e9260e932..9bfc7c397b8 100644 --- a/spec/javascripts/ide/stores/actions/merge_request_spec.js +++ b/spec/javascripts/ide/stores/actions/merge_request_spec.js @@ -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 occurred 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 occurred 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 occurred whilst loading the merge request version data.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/javascripts/ide/stores/actions/tree_spec.js b/spec/javascripts/ide/stores/actions/tree_spec.js index d47c60dc581..bd41e87bf0e 100644 --- a/spec/javascripts/ide/stores/actions/tree_spec.js +++ b/spec/javascripts/ide/stores/actions/tree_spec.js @@ -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 occurred whilst loading all the files.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { projectId: 'abc/def', branchId: 'master-testing' }, diff --git a/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js b/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js index c9c09ee9afe..0937ee38390 100644 --- a/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js +++ b/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js @@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occured whilst fetching the latest pipeline.', + text: 'An error occurred whilst fetching the latest pipeline.', 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 occurred 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 occurred whilst fetching the job trace.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: null, |