summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/projects/pipelines
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-19 12:11:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-19 12:11:06 +0000
commit1fdc1d34e8e3cab28cd010a2b352974da9847e8e (patch)
treea8158b1ef1a1f09ccb7d4789a3d7e519d8825b37 /app/assets/javascripts/projects/pipelines
parentc44a81b8b9f4c27bec1f6df6ea25f135c390b730 (diff)
downloadgitlab-ce-1fdc1d34e8e3cab28cd010a2b352974da9847e8e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects/pipelines')
-rw-r--r--app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
index 733f833d51a..09ca1fbe6c6 100644
--- a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
+++ b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
@@ -252,10 +252,10 @@ export default {
},
errorTexts: {
[LOAD_ANALYTICS_FAILURE]: s__(
- 'PipelineCharts|An error has ocurred when retrieving the analytics data',
+ 'PipelineCharts|An error has occurred when retrieving the analytics data',
),
[LOAD_PIPELINES_FAILURE]: s__(
- 'PipelineCharts|An error has ocurred when retrieving the pipelines data',
+ 'PipelineCharts|An error has occurred when retrieving the pipelines data',
),
[PARSE_FAILURE]: s__('PipelineCharts|There was an error parsing the data for the charts.'),
[DEFAULT]: s__('PipelineCharts|An unknown error occurred while processing CI/CD analytics.'),