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

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" }

changelogs/unreleased/zj-reword-job-to-pipeline-chart-view.yml

+---
+title: Reword job to pipeline to reflect what the graphs are really about
+merge_request:
+author:
+type: fixed

features/steps/project/graph.rb

@@ -38,9 +38,9 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps
 
   step 'page should have CI graphs' do
     expect(page).to have_content 'Overall'
-    expect(page).to have_content 'Jobs for last week'
-    expect(page).to have_content 'Jobs for last month'
-    expect(page).to have_content 'Jobs for last year'
+    expect(page).to have_content 'Pipelines for last week'
+    expect(page).to have_content 'Pipelines for last month'
+    expect(page).to have_content 'Pipelines for last year'
     expect(page).to have_content 'Commit duration in minutes for last 30 commits'
   end
 

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-18 14:15+0530\n"
-"PO-Revision-Date: 2017-08-18 14:15+0530\n"
+"POT-Creation-Date: 2017-08-24 09:29+0200\n"
+"PO-Revision-Date: 2017-08-24 09:29+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -517,15 +517,6 @@ msgstr ""
 msgid "Issue events"
 msgstr ""
 
-msgid "Jobs for last month"
-msgstr ""
-
-msgid "Jobs for last week"
-msgstr ""
-
-msgid "Jobs for last year"
-msgstr ""
-
 msgid "LFSStatus|Disabled"
 msgstr ""
 
@@ -766,6 +757,15 @@ msgstr ""
 msgid "Pipelines charts"
 msgstr ""
 
+msgid "Pipelines for last month"
+msgstr ""
+
+msgid "Pipelines for last week"
+msgstr ""
+
+msgid "Pipelines for last year"
+msgstr ""
+
 msgid "Pipeline|all"
 msgstr ""