Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-25 11:41:55 +0300
committerDouwe Maan <douwe@gitlab.com>2017-08-25 11:41:55 +0300
commitdcf4d69a7e34fc0a093c1226833f8654f16c74f7 (patch)
tree19c0968db8f8b7cf05e37a8570e377d1f7579acc
parent65c223ae836925a056c86b92351cea85aa26e9ef (diff)
parenta8efe4c469b13519b600e5ef0f5b1629cd42b01c (diff)
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
-rw-r--r--app/views/projects/pipelines/charts/_pipelines.haml6
-rw-r--r--changelogs/unreleased/zj-reword-job-to-pipeline-chart-view.yml5
-rw-r--r--features/steps/project/graph.rb6
-rw-r--r--locale/gitlab.pot22
4 files changed, 22 insertions, 17 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" }
diff --git a/changelogs/unreleased/zj-reword-job-to-pipeline-chart-view.yml b/changelogs/unreleased/zj-reword-job-to-pipeline-chart-view.yml
new file mode 100644
index 00000000000..474392a8cdd
--- /dev/null
+++ b/changelogs/unreleased/zj-reword-job-to-pipeline-chart-view.yml
@@ -0,0 +1,5 @@
+---
+title: Reword job to pipeline to reflect what the graphs are really about
+merge_request:
+author:
+type: fixed
diff --git a/features/steps/project/graph.rb b/features/steps/project/graph.rb
index e78e25318a6..b9cddf4041d 100644
--- a/features/steps/project/graph.rb
+++ b/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
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a4a3ef6c42c..5a1db208d5a 100644
--- a/locale/gitlab.pot
+++ b/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 ""