Skip to content

G
gitlab-ce
Commit 2d0bf022 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files
Options

Merge branch 'fix-typo-pipline-to-pipeline' into 'master' 

Fix typo pipline to pipeline

See merge request gitlab-org/gitlab-ce!23129
parents a480c551 75815769
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
View file @ 2d0bf022
...@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => { ...@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => {
dispatch( dispatch(
'setErrorMessage', 'setErrorMessage',
{ {
text: __('An error occured whilst fetching the latest pipline.'), text: __('An error occured whilst fetching the latest pipeline.'),
action: () => action: () =>
dispatch('forcePipelineRequest').then(() => dispatch('forcePipelineRequest').then(() =>
dispatch('setErrorMessage', null, { root: true }), dispatch('setErrorMessage', null, { root: true }),
......
locale/ar_SA/gitlab.po
View file @ 2d0bf022
...@@ -681,7 +681,7 @@ msgstr "" ...@@ -681,7 +681,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/bg/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/ca_ES/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/cs_CZ/gitlab.po
View file @ 2d0bf022
...@@ -621,7 +621,7 @@ msgstr "" ...@@ -621,7 +621,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/da_DK/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/de/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/eo/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/es/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/et_EE/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/fil_PH/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/fr/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "Une erreur est survenue lors de la création de la nouvelle branche." ...@@ -561,7 +561,7 @@ msgstr "Une erreur est survenue lors de la création de la nouvelle branche."
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "Une erreur est survenue pendant le rapatriement de la trace de la tâche." msgstr "Une erreur est survenue pendant le rapatriement de la trace de la tâche."
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "Une erreur est survenue lors du rapatriement de dernier pipeline." msgstr "Une erreur est survenue lors du rapatriement de dernier pipeline."
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/gitlab.pot
View file @ 2d0bf022
...@@ -501,7 +501,7 @@ msgstr "" ...@@ -501,7 +501,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/gl_ES/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/he_IL/gitlab.po
View file @ 2d0bf022
...@@ -621,7 +621,7 @@ msgstr "" ...@@ -621,7 +621,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/id_ID/gitlab.po
View file @ 2d0bf022
...@@ -531,7 +531,7 @@ msgstr "" ...@@ -531,7 +531,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/it/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/ja/gitlab.po
View file @ 2d0bf022
...@@ -531,7 +531,7 @@ msgstr "新しいブランチの作成中にエラーが発生しました。" ...@@ -531,7 +531,7 @@ msgstr "新しいブランチの作成中にエラーが発生しました。"
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "ジョブトレースの取得中にエラーが発生しました。" msgstr "ジョブトレースの取得中にエラーが発生しました。"
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "最新のパイプラインの取得中にエラーが発生しました。" msgstr "最新のパイプラインの取得中にエラーが発生しました。"
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/ko/gitlab.po
View file @ 2d0bf022
...@@ -531,7 +531,7 @@ msgstr "새 브랜치를 만드는 동안 오류가 발생했습니다." ...@@ -531,7 +531,7 @@ msgstr "새 브랜치를 만드는 동안 오류가 발생했습니다."
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/mn_MN/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/nb_NO/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/nl_NL/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/pl_PL/gitlab.po
View file @ 2d0bf022
...@@ -621,7 +621,7 @@ msgstr "" ...@@ -621,7 +621,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/pt_BR/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "Um erro ocorreu ao criar o novo branch." ...@@ -561,7 +561,7 @@ msgstr "Um erro ocorreu ao criar o novo branch."
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "Ocorreu um erro ao carregar o rastro da tarefa." msgstr "Ocorreu um erro ao carregar o rastro da tarefa."
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "Ocorreu um erro ao carregar o último pipeline." msgstr "Ocorreu um erro ao carregar o último pipeline."
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/ro_RO/gitlab.po
View file @ 2d0bf022
...@@ -591,7 +591,7 @@ msgstr "" ...@@ -591,7 +591,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/ru/gitlab.po
View file @ 2d0bf022
...@@ -621,7 +621,7 @@ msgstr "" ...@@ -621,7 +621,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/sq_AL/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/tr_TR/gitlab.po
View file @ 2d0bf022
...@@ -561,7 +561,7 @@ msgstr "" ...@@ -561,7 +561,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/uk/gitlab.po
View file @ 2d0bf022
...@@ -621,7 +621,7 @@ msgstr "Помилка при створенні нової гілки." ...@@ -621,7 +621,7 @@ msgstr "Помилка при створенні нової гілки."
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "Трапилася помилка при отриманні логу завдання." msgstr "Трапилася помилка при отриманні логу завдання."
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "Трапилася помилка при отриманні даних останнього конвеєра." msgstr "Трапилася помилка при отриманні даних останнього конвеєра."
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/zh_CN/gitlab.po
View file @ 2d0bf022
...@@ -531,7 +531,7 @@ msgstr "创建分支时发生错误。" ...@@ -531,7 +531,7 @@ msgstr "创建分支时发生错误。"
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "获取作业日志时发生错误。" msgstr "获取作业日志时发生错误。"
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "获取流水线时发生错误。" msgstr "获取流水线时发生错误。"
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/zh_HK/gitlab.po
View file @ 2d0bf022
...@@ -531,7 +531,7 @@ msgstr "" ...@@ -531,7 +531,7 @@ msgstr ""
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "" msgstr ""
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "" msgstr ""
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
locale/zh_TW/gitlab.po
View file @ 2d0bf022
...@@ -531,7 +531,7 @@ msgstr "創建新分支時發生錯誤。" ...@@ -531,7 +531,7 @@ msgstr "創建新分支時發生錯誤。"
msgid "An error occured whilst fetching the job trace." msgid "An error occured whilst fetching the job trace."
msgstr "取得工作追蹤資訊時發生錯誤" msgstr "取得工作追蹤資訊時發生錯誤"
msgid "An error occured whilst fetching the latest pipline." msgid "An error occured whilst fetching the latest pipeline."
msgstr "取得最新流水線時發生錯誤" msgstr "取得最新流水線時發生錯誤"
msgid "An error occured whilst loading all the files." msgid "An error occured whilst loading all the files."
......
spec/finders/pipelines_finder_spec.rb
View file @ 2d0bf022
...@@ -225,7 +225,7 @@ describe PipelinesFinder do ...@@ -225,7 +225,7 @@ describe PipelinesFinder do
end end
end end
context 'when the project has limited access to piplines' do context 'when the project has limited access to pipelines' do
let(:project) { create(:project, :private, :repository) } let(:project) { create(:project, :private, :repository) }
let(:current_user) { create(:user) } let(:current_user) { create(:user) }
let!(:pipelines) { create_list(:ci_pipeline, 2, project: project) } let!(:pipelines) { create_list(:ci_pipeline, 2, project: project) }
......
spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
View file @ 2d0bf022
...@@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => { ...@@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => {
{ {
type: 'setErrorMessage', type: 'setErrorMessage',
payload: { payload: {
text: 'An error occured whilst fetching the latest pipline.', text: 'An error occured whilst fetching the latest pipeline.',
action: jasmine.any(Function), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: null, actionPayload: null,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7