kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'

Browse source 
Reword job to pipeline on the chart view

Closes #36928

See merge request !13786
This commit is contained in:
Douwe Maan 2017-08-25 08:41:55 +00:00
commit dcf4d69a7e
4 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/projects/pipelines/charts/_pipelines.haml
View file

@ -14,19 +14,19 @@
.prepend-top-default .prepend-top-default
%p.light %p.light
= _("Jobs for last week") = _("Pipelines for last week")
(#{date_from_to(Date.today - 7.days, Date.today)}) (#{date_from_to(Date.today - 7.days, Date.today)})
%canvas#weekChart{ height: 200 } %canvas#weekChart{ height: 200 }
.prepend-top-default .prepend-top-default
%p.light %p.light
= _("Jobs for last month") = _("Pipelines for last month")
(#{date_from_to(Date.today - 30.days, Date.today)}) (#{date_from_to(Date.today - 30.days, Date.today)})
%canvas#monthChart{ height: 200 } %canvas#monthChart{ height: 200 }
.prepend-top-default .prepend-top-default
%p.light %p.light
= _("Jobs for last year") = _("Pipelines for last year")
%canvas#yearChart.padded{ height: 250 } %canvas#yearChart.padded{ height: 250 }
%script#pipelinesChartsData{ type: "application/json" } %script#pipelinesChartsData{ type: "application/json" }

5
changelogs/unreleased/zj-reword-job-to-pipeline-chart-view.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Reword job to pipeline to reflect what the graphs are really about
merge_request:
author:
type: fixed

6
features/steps/project/graph.rb
View file

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

22
locale/gitlab.pot
View file

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