summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-10 16:27:50 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-10 16:27:50 +0100
commit802b8fceb444f02fb8c2f67c5c433832baa33be7 (patch)
treefbf68c1b83ccb088d700fa324a7e21a86dfb3923
parentb1a1cadcc2056540e4eb5a6b48c87b83656633be (diff)
downloadgitlab-ce-improve-ci-graphs.tar.gz
Fix graph description and textimprove-ci-graphs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/projects/graphs/ci/_builds.haml4
-rw-r--r--features/steps/project/graph.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/graphs/ci/_builds.haml b/app/views/projects/graphs/ci/_builds.haml
index 84247455403..8fca07114fa 100644
--- a/app/views/projects/graphs/ci/_builds.haml
+++ b/app/views/projects/graphs/ci/_builds.haml
@@ -17,13 +17,13 @@
.prepend-top-default
%p.light
- Builds chart for last month
+ Builds for last month
(#{date_from_to(Date.today - 30.days, Date.today)})
%canvas#monthChart{height: 200}
.prepend-top-default
%p.light
- Builds chart for last year
+ Builds for last year
%canvas#yearChart.padded{height: 250}
- [:week, :month, :year].each do |scope|
diff --git a/features/steps/project/graph.rb b/features/steps/project/graph.rb
index 4abd5288d51..98f31f3b76a 100644
--- a/features/steps/project/graph.rb
+++ b/features/steps/project/graph.rb
@@ -25,9 +25,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 'Builds chart for last week'
- expect(page).to have_content 'Builds chart for last month'
- expect(page).to have_content 'Builds chart for last year'
+ expect(page).to have_content 'Builds for last week'
+ expect(page).to have_content 'Builds for last month'
+ expect(page).to have_content 'Builds for last year'
expect(page).to have_content 'Commit duration in minutes for last 30 commits'
end