diff options
author | Marin Jankovski <marin@gitlab.com> | 2015-03-04 06:32:12 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2015-03-04 06:32:12 +0000 |
commit | 8e7e77e4b61a1ca587b91b3ff65a26601eebcf7d (patch) | |
tree | c3eae00836c4fa08a75d2aba33113b21cfc0da38 | |
parent | 094f4895db6d16e75e44b11f8359e8a41b103a15 (diff) | |
parent | b5ec0d6d450b32fa00d95d864fa797f64e9ca17e (diff) | |
download | gitlab-ce-8e7e77e4b61a1ca587b91b3ff65a26601eebcf7d.tar.gz |
Merge branch 'commits_statistic' into 'master'test-fix
Commits statistic grammar
Fixes #2089
Changed spelling from Commits statistic to Commit statistics
See merge request !1625
-rw-r--r-- | app/views/projects/graphs/commits.html.haml | 2 | ||||
-rw-r--r-- | features/steps/project/graph.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/graphs/commits.html.haml b/app/views/projects/graphs/commits.html.haml index a189a487135..4a5d09b9503 100644 --- a/app/views/projects/graphs/commits.html.haml +++ b/app/views/projects/graphs/commits.html.haml @@ -1,7 +1,7 @@ = render 'head' %p.lead - Commits statistic for + Commit statistics for %strong #{@repository.root_ref} #{@commits_graph.start_date.strftime('%b %d')} - #{@commits_graph.end_date.strftime('%b %d')} diff --git a/features/steps/project/graph.rb b/features/steps/project/graph.rb index bc07c3d413c..a2807c340f6 100644 --- a/features/steps/project/graph.rb +++ b/features/steps/project/graph.rb @@ -17,7 +17,7 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps end step 'page should have commits graphs' do - page.should have_content "Commits statistic for master" + page.should have_content "Commit statistics for master" page.should have_content "Commits per day of month" end end |