Skip to content
Snippets Groups Projects
Unverified Commit a8efe4c4 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg
Browse files

Reword job to pipeline on the chart view

This got changed for i18n in !12480, however, I forgot to understand
that the meaning of the graphs changed in !12378. This corrects the
behaviour.
parent 99bb3dde
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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" }
Loading
Loading
---
title: Reword job to pipeline to reflect what the graphs are really about
merge_request:
author:
type: fixed
Loading
Loading
@@ -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
 
Loading
Loading
Loading
Loading
@@ -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"
Loading
Loading
@@ -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 ""
 
Loading
Loading
@@ -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 ""
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment