summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-30 00:22:52 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-30 00:22:52 +0000
commit3460359514e2a97d54ed691a8c37e6e7b86222a8 (patch)
treefd5462189e507ff7aa4770e602773857e2bd17f3
parentb021cc261b85dcda73040f37cf32b9d714c125b8 (diff)
parent530d222815b62180145d3cbe89cd3602835de8ad (diff)
downloadgitlab-ce-3460359514e2a97d54ed691a8c37e6e7b86222a8.tar.gz
Merge branch '25002-sentence-case-dashboard-tabs' into 'master'
Changes project dashboard tabs to sentence casing Changes the nav tab titles on the project dashboard page (```https://gitlab.com/dashboard/projects```) from title casing to sentence casing. Before: ![Screen_Shot_2016-11-26_at_11.17.23_PM](/uploads/a31c951cf83f7670acee778db9337be5/Screen_Shot_2016-11-26_at_11.17.23_PM.png) After: ![Screen_Shot_2016-11-26_at_11.17.39_PM](/uploads/a0cb5f6b6771e6f5149750ea1e7beb02/Screen_Shot_2016-11-26_at_11.17.39_PM.png) Closes #25002 See merge request !7774
-rw-r--r--app/views/dashboard/_projects_head.html.haml6
-rw-r--r--changelogs/unreleased/25002-sentence-case-dashboard-tabs.yml4
-rw-r--r--spec/features/profiles/preferences_spec.rb2
3 files changed, 8 insertions, 4 deletions
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index f7abad54286..48b0fd504f4 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -4,13 +4,13 @@
%ul.nav-links
= nav_link(page: [dashboard_projects_path, root_path]) do
= link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
- Your Projects
+ Your projects
= nav_link(page: starred_dashboard_projects_path) do
= link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
- Starred Projects
+ Starred projects
= nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do
= link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do
- Explore Projects
+ Explore projects
.nav-controls
= form_tag request.path, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
diff --git a/changelogs/unreleased/25002-sentence-case-dashboard-tabs.yml b/changelogs/unreleased/25002-sentence-case-dashboard-tabs.yml
new file mode 100644
index 00000000000..cc8b0e28277
--- /dev/null
+++ b/changelogs/unreleased/25002-sentence-case-dashboard-tabs.yml
@@ -0,0 +1,4 @@
+---
+title: Sentence cased the nav tab headers on the project dashboard page
+merge_request:
+author: Ryan Harris
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/preferences_spec.rb
index d14a1158b67..a6b841c0210 100644
--- a/spec/features/profiles/preferences_spec.rb
+++ b/spec/features/profiles/preferences_spec.rb
@@ -73,7 +73,7 @@ describe 'Profile > Preferences', feature: true do
expect(page.current_path).to eq starred_dashboard_projects_path
end
- click_link 'Your Projects'
+ click_link 'Your projects'
expect(page).not_to have_content("You don't have starred projects yet")
expect(page.current_path).to eq dashboard_projects_path