diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-25 08:41:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-25 08:41:55 +0000 |
| commit | dcf4d69a7e34fc0a093c1226833f8654f16c74f7 (patch) | |
| tree | 19c0968db8f8b7cf05e37a8570e377d1f7579acc /app | |
| parent | 65c223ae836925a056c86b92351cea85aa26e9ef (diff) | |
| parent | a8efe4c469b13519b600e5ef0f5b1629cd42b01c (diff) | |
| download | gitlab-ce-dcf4d69a7e34fc0a093c1226833f8654f16c74f7.tar.gz | |
Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'
Reword job to pipeline on the chart view
Closes #36928
See merge request !13786
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/pipelines/charts/_pipelines.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/pipelines/charts/_pipelines.haml b/app/views/projects/pipelines/charts/_pipelines.haml index 02f1ef4b6da..7a100843f5e 100644 --- a/app/views/projects/pipelines/charts/_pipelines.haml +++ b/app/views/projects/pipelines/charts/_pipelines.haml @@ -14,19 +14,19 @@ .prepend-top-default %p.light - = _("Jobs for last week") + = _("Pipelines for last week") (#{date_from_to(Date.today - 7.days, Date.today)}) %canvas#weekChart{ height: 200 } .prepend-top-default %p.light - = _("Jobs for last month") + = _("Pipelines for last month") (#{date_from_to(Date.today - 30.days, Date.today)}) %canvas#monthChart{ height: 200 } .prepend-top-default %p.light - = _("Jobs for last year") + = _("Pipelines for last year") %canvas#yearChart.padded{ height: 250 } %script#pipelinesChartsData{ type: "application/json" } |