diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index bfe35e9346d806becb6a0fa9bfcdb1611474a45e..70071a3ff533b6beb2e09a23106be163c9e225a5 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -80,7 +80,7 @@ export default { return this.getUserData; }, mappedLines() { - // TODO: Do this data generation when we recieve a response to save a computed property being created + // TODO: Do this data generation when we receive a response to save a computed property being created return this.diffLines(this.diffFile).map(mapParallel(this)) || []; }, }, diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/index.js b/app/assets/javascripts/vue_merge_request_widget/components/extensions/index.js index 6adb12f9568479c05011c72cd4f50b17b0bdf5aa..7e329399957752912c9779fdab3eba2bd06e5ee5 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/index.js @@ -36,7 +36,7 @@ export const registerExtension = (extension) => { (acc, computedKey) => ({ ...acc, // Making the computed property a method allows us to pass in arguments - // this allows for each computed property to recieve some data + // this allows for each computed property to receive some data [computedKey]() { return extension.computed[computedKey]; }, diff --git a/changelogs/archive-ee.md b/changelogs/archive-ee.md index 0f9568cac6f84d4edc99d5e02ad06a5c6139122b..eee8606476172b833c1c6d577b763093c55d12ad 100644 --- a/changelogs/archive-ee.md +++ b/changelogs/archive-ee.md @@ -210,7 +210,7 @@ ## 9.3.4 (2017-07-03) -- Update gitlab-shell to 5.1.1 to fix Post Recieve errors +- Update gitlab-shell to 5.1.1 to fix Post Receive errors ## 9.3.3 (2017-06-30) diff --git a/ee/app/assets/javascripts/related_items_tree/store/actions.js b/ee/app/assets/javascripts/related_items_tree/store/actions.js index 8ea75ac421941ea67092f7863a643fa5ad7e0416..d45bf45badc5d60b093cc2b4f13f18a0d953e05e 100644 --- a/ee/app/assets/javascripts/related_items_tree/store/actions.js +++ b/ee/app/assets/javascripts/related_items_tree/store/actions.js @@ -582,9 +582,9 @@ export const createNewIssue = ({ state, dispatch }, { issuesEndpoint, title }) = export const requestProjects = ({ commit }) => commit(types.REQUEST_PROJECTS); export const receiveProjectsSuccess = ({ commit }, data) => - commit(types.RECIEVE_PROJECTS_SUCCESS, data); + commit(types.RECEIVE_PROJECTS_SUCCESS, data); export const receiveProjectsFailure = ({ commit }) => { - commit(types.RECIEVE_PROJECTS_FAILURE); + commit(types.RECEIVE_PROJECTS_FAILURE); createFlash({ message: __('Something went wrong while fetching projects.'), }); diff --git a/ee/app/assets/javascripts/related_items_tree/store/mutation_types.js b/ee/app/assets/javascripts/related_items_tree/store/mutation_types.js index 31bd916504f5e2437a2cc1affb2222d60ea68753..0eaf089d1fdc690eda04999c00e733f0a57ffdb8 100644 --- a/ee/app/assets/javascripts/related_items_tree/store/mutation_types.js +++ b/ee/app/assets/javascripts/related_items_tree/store/mutation_types.js @@ -47,8 +47,8 @@ export const MOVE_ITEM_FAILURE = 'MOVE_ITEM_FAILURE'; export const SET_PROJECTS = 'SET_PROJECTS'; export const REQUEST_PROJECTS = 'REQUEST_PROJECTS'; -export const RECIEVE_PROJECTS_SUCCESS = 'RECIEVE_PROJECTS_SUCCESS'; -export const RECIEVE_PROJECTS_FAILURE = 'RECIEVE_PROJECTS_FAILURE'; +export const RECEIVE_PROJECTS_SUCCESS = 'RECEIVE_PROJECTS_SUCCESS'; +export const RECEIVE_PROJECTS_FAILURE = 'RECEIVE_PROJECTS_FAILURE'; export const REQUEST_DESCENDANT_GROUPS = 'REQUEST_DESCENDANT_GROUPS'; export const RECEIVE_DESCENDANT_GROUPS_SUCCESS = 'RECEIVE_DESCENDANT_GROUPS_SUCCESS'; diff --git a/ee/app/assets/javascripts/related_items_tree/store/mutations.js b/ee/app/assets/javascripts/related_items_tree/store/mutations.js index 573ec68038436357819a13968e6e5f1d1634bdc0..9c03d3bc3c801797c10d15ea0f7540d1040bda53 100644 --- a/ee/app/assets/javascripts/related_items_tree/store/mutations.js +++ b/ee/app/assets/javascripts/related_items_tree/store/mutations.js @@ -269,11 +269,11 @@ export default { [types.REQUEST_PROJECTS](state) { state.projectsFetchInProgress = true; }, - [types.RECIEVE_PROJECTS_SUCCESS](state, projects) { + [types.RECEIVE_PROJECTS_SUCCESS](state, projects) { state.projects = projects; state.projectsFetchInProgress = false; }, - [types.RECIEVE_PROJECTS_FAILURE](state) { + [types.RECEIVE_PROJECTS_FAILURE](state) { state.projectsFetchInProgress = false; }, diff --git a/ee/spec/frontend/related_items_tree/store/actions_spec.js b/ee/spec/frontend/related_items_tree/store/actions_spec.js index 6b4f5204e56b662928d3bc18cdda428b77cf81bb..705d5695d2c6752f6bc7cec184658c9bb47c7be9 100644 --- a/ee/spec/frontend/related_items_tree/store/actions_spec.js +++ b/ee/spec/frontend/related_items_tree/store/actions_spec.js @@ -1676,7 +1676,7 @@ describe('RelatedItemTree', () => { actions.receiveProjectsSuccess, mockProjects, {}, - [{ type: types.RECIEVE_PROJECTS_SUCCESS, payload: mockProjects }], + [{ type: types.RECEIVE_PROJECTS_SUCCESS, payload: mockProjects }], [], ); }); @@ -1688,7 +1688,7 @@ describe('RelatedItemTree', () => { actions.receiveProjectsFailure, {}, {}, - [{ type: types.RECIEVE_PROJECTS_FAILURE }], + [{ type: types.RECEIVE_PROJECTS_FAILURE }], [], ); }); diff --git a/ee/spec/frontend/related_items_tree/store/mutations_spec.js b/ee/spec/frontend/related_items_tree/store/mutations_spec.js index 88e419b9dd33fb336152a0eda9ab81a765e63cfe..b10b5b2451c29d6b2127879e0a403cdaca1684bd 100644 --- a/ee/spec/frontend/related_items_tree/store/mutations_spec.js +++ b/ee/spec/frontend/related_items_tree/store/mutations_spec.js @@ -683,23 +683,23 @@ describe('RelatedItemsTree', () => { }); }); - describe(types.RECIEVE_PROJECTS_SUCCESS, () => { + describe(types.RECEIVE_PROJECTS_SUCCESS, () => { it('should set `projectsFetchInProgress` to false and provided `projects` param as it is within the state', () => { const projects = [ { id: 1, name: 'foo' }, { id: 2, name: 'bar' }, ]; - mutations[types.RECIEVE_PROJECTS_SUCCESS](state, projects); + mutations[types.RECEIVE_PROJECTS_SUCCESS](state, projects); expect(state.projects).toBe(projects); expect(state.projectsFetchInProgress).toBe(false); }); }); - describe(types.RECIEVE_PROJECTS_FAILURE, () => { + describe(types.RECEIVE_PROJECTS_FAILURE, () => { it('should set `projectsFetchInProgress` to false within state', () => { - mutations[types.RECIEVE_PROJECTS_FAILURE](state); + mutations[types.RECEIVE_PROJECTS_FAILURE](state); expect(state.projectsFetchInProgress).toBe(false); }); diff --git a/spec/frontend/user_lists/store/edit/mutations_spec.js b/spec/frontend/user_lists/store/edit/mutations_spec.js index 7971906429b0de160f91acece54b8a1ee162cefd..e07d9c0a1b5903d601e87fefe16eaf6c221e1012 100644 --- a/spec/frontend/user_lists/store/edit/mutations_spec.js +++ b/spec/frontend/user_lists/store/edit/mutations_spec.js @@ -35,7 +35,7 @@ describe('User List Edit Mutations', () => { }); }); - describe(types.RECIEVE_USER_LIST_ERROR, () => { + describe(types.RECEIVE_USER_LIST_ERROR, () => { beforeEach(() => { mutations[types.RECEIVE_USER_LIST_ERROR](state, ['network error']); }); @@ -44,7 +44,7 @@ describe('User List Edit Mutations', () => { expect(state.status).toBe(statuses.ERROR); }); - it('sets the error message to the recieved one', () => { + it('sets the error message to the received one', () => { expect(state.errorMessage).toEqual(['network error']); }); }); diff --git a/spec/frontend/user_lists/store/new/mutations_spec.js b/spec/frontend/user_lists/store/new/mutations_spec.js index a928849e9415cfe9c66bdc67e82c1a7eb9927bae..647ddd9c062b897fd71a99672597e9dddceaac01 100644 --- a/spec/frontend/user_lists/store/new/mutations_spec.js +++ b/spec/frontend/user_lists/store/new/mutations_spec.js @@ -9,7 +9,7 @@ describe('User List Edit Mutations', () => { state = createState({ projectId: '1' }); }); - describe(types.RECIEVE_USER_LIST_ERROR, () => { + describe(types.RECEIVE_USER_LIST_ERROR, () => { beforeEach(() => { mutations[types.RECEIVE_CREATE_USER_LIST_ERROR](state, ['network error']); }); diff --git a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb index 4320c5460da6fce51dc9e79ca067cb6c0a006954..5172a9389f9f82e032cc8cf28f150c31efbbfd42 100644 --- a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb @@ -188,7 +188,7 @@ end shared_examples 'a failed branch deletion' do - it 'raises a PreRecieveError' do + it 'raises a PreReceiveError' do expect_any_instance_of(Gitaly::OperationService::Stub) .to receive(:user_delete_branch).with(request, kind_of(Hash)) .and_raise(custom_hook_error) @@ -288,7 +288,7 @@ end shared_examples 'a failed merge' do - it 'raises a PreRecieveError' do + it 'raises a PreReceiveError' do expect_any_instance_of(Gitaly::OperationService::Stub) .to receive(:user_merge_branch).with(kind_of(Enumerator), kind_of(Hash)) .and_raise(custom_hook_error) diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index b719adcdace2783aefba72d292792c1867e02481..93d502d2101c747929c6bff8f90ecab07c4e4b7f 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -1447,7 +1447,7 @@ def create_build(name, status) let(:build_c) { create_build('build3', queued_at: 0) } %w[succeed! drop! cancel! skip! block! delay!].each do |action| - context "when the pipeline recieved #{action} event" do + context "when the pipeline received #{action} event" do it 'deletes a persistent ref' do expect(pipeline.persistent_ref).to receive(:delete).once @@ -1670,7 +1670,7 @@ def create_build(name, status) end %w[succeed! drop! cancel! skip!].each do |action| - context "when the pipeline recieved #{action} event" do + context "when the pipeline received #{action} event" do it 'performs AutoMergeProcessWorker' do expect(AutoMergeProcessWorker).to receive(:perform_async).with(merge_request.id) diff --git a/workhorse/internal/git/error.go b/workhorse/internal/git/error.go index 86a2ba44767f6038dd2b7e09fa477b58d0a93b8d..28b5a02073ed522b4ef302e905261f9f48b173d2 100644 --- a/workhorse/internal/git/error.go +++ b/workhorse/internal/git/error.go @@ -44,7 +44,7 @@ func handleLimitErr(err error, w io.Writer, f func(w io.Writer) error) { } // writeReceivePackError writes a "server is busy" error message to the -// git-recieve-pack-result. +// git-receive-pack-result. // // 0023\x01001aunpack server is busy // 00000044\x2GitLab is currently unable to handle this request due to load. diff --git a/workhorse/internal/git/error_test.go b/workhorse/internal/git/error_test.go index d87c81fc83c2d372e418fec89f1df8efa723a8dc..9ea1d42796eb5e575e6715c2df3d62885d5b72ab 100644 --- a/workhorse/internal/git/error_test.go +++ b/workhorse/internal/git/error_test.go @@ -30,7 +30,7 @@ func TestHandleLimitErr(t *testing.T) { }, []byte{}), }, { - desc: "recieve pack", + desc: "receive pack", errWriter: writeReceivePackError, expectedBytes: bytes.Join([][]byte{ {'0', '0', '2', '3', 1, '0', '0', '1', 'a'},