Commit 1fc9595b authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'ag/occured-to-occurred' into 'master'

Fix typo in message

See merge request gitlab-org/gitlab!78900
parents 7d45e44f 06e7bbc6
......@@ -39,7 +39,7 @@ export default {
this.jobsPageInfo = data.project?.pipeline?.jobs?.pageInfo || {};
},
error() {
createFlash({ message: __('An error occured while fetching the pipelines jobs.') });
createFlash({ message: __('An error occurred while fetching the pipelines jobs.') });
},
},
},
......
......@@ -15,7 +15,7 @@
.gl-alert-container
= sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-content
%h4.gl-alert-title= _('Internal error occured while delivering this webhook.')
%h4.gl-alert-title= _('Internal error occurred while delivering this webhook.')
.gl-alert-body
= _('Error: %{error}') % { error: hook_log.internal_error_message }
......
import { s__ } from '~/locale';
export const GENERAL_ERROR_MESSAGE = s__(
'PurchaseStep|An error occured in the purchase step. If the problem persists please contact support@gitlab.com.',
'PurchaseStep|An error occurred in the purchase step. If the problem persists please contact support@gitlab.com.',
);
......@@ -3659,9 +3659,6 @@ msgstr ""
msgid "An error in reporting in which a test result incorrectly indicates the presence of a vulnerability in a system when the vulnerability is not present."
msgstr ""
msgid "An error occured while fetching the pipelines jobs."
msgstr ""
msgid "An error occurred adding a draft to the thread."
msgstr ""
......@@ -3809,6 +3806,9 @@ msgstr ""
msgid "An error occurred while fetching the latest pipeline."
msgstr ""
msgid "An error occurred while fetching the pipelines jobs."
msgstr ""
msgid "An error occurred while fetching the releases. Please try again."
msgstr ""
......@@ -19358,7 +19358,7 @@ msgstr ""
msgid "Internal URL (optional)"
msgstr ""
msgid "Internal error occured while delivering this webhook."
msgid "Internal error occurred while delivering this webhook."
msgstr ""
msgid "Internal users"
......@@ -29068,7 +29068,7 @@ msgstr ""
msgid "Purchase more storage"
msgstr ""
msgid "PurchaseStep|An error occured in the purchase step. If the problem persists please contact support@gitlab.com."
msgid "PurchaseStep|An error occurred in the purchase step. If the problem persists please contact support@gitlab.com."
msgstr ""
msgid "Push"
......
......@@ -74,7 +74,7 @@ describe('Jobs app', () => {
await waitForPromises();
expect(createFlash).toHaveBeenCalledWith({
message: 'An error occured while fetching the pipelines jobs.',
message: 'An error occurred while fetching the pipelines jobs.',
});
});
......
......@@ -18,7 +18,7 @@ RSpec.shared_examples_for 'graphql mutations security ci configuration' do
ServiceResponse.success(payload: { branch: branch, success_path: success_path })
end
let(:error) { "An error occured!" }
let(:error) { "An error occurred!" }
let(:service_error_response) do
ServiceResponse.error(message: error)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment