diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:05:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:05:50 +0000 |
| commit | 891f7cbabe4bf6a3384869896c27f39022377a8a (patch) | |
| tree | 219f678521808e12045534382821d86f40943a72 | |
| parent | 04edbb5fb34c219e5179e3a6f59584835ce9ef8f (diff) | |
| parent | 008d571f5da5b2dd01293f72a7e8177aa81b864e (diff) | |
| download | gitlab-ce-891f7cbabe4bf6a3384869896c27f39022377a8a.tar.gz | |
Merge branch 'fix/activity-nav-inconsistent-capitalization' into 'master'
Fix top-area inconsistent capitalization
See merge request gitlab-org/gitlab-ce!16476
| -rw-r--r-- | app/views/dashboard/_activity_head.html.haml | 4 | ||||
| -rw-r--r-- | app/views/dashboard/_snippets_head.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/dashboard/_activity_head.html.haml b/app/views/dashboard/_activity_head.html.haml index ecdf76ef5c5..7a3f3667ac1 100644 --- a/app/views/dashboard/_activity_head.html.haml +++ b/app/views/dashboard/_activity_head.html.haml @@ -2,7 +2,7 @@ %ul.nav-links %li{ class: active_when(params[:filter].nil?) }> = link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do - Your Projects + Your projects %li{ class: active_when(params[:filter] == 'starred') }> = link_to activity_dashboard_path(filter: 'starred'), data: {placement: 'right'} do - Starred Projects + Starred projects diff --git a/app/views/dashboard/_snippets_head.html.haml b/app/views/dashboard/_snippets_head.html.haml index 7330f4cb523..a9488df07bd 100644 --- a/app/views/dashboard/_snippets_head.html.haml +++ b/app/views/dashboard/_snippets_head.html.haml @@ -2,10 +2,10 @@ %ul.nav-links = nav_link(page: dashboard_snippets_path, html_options: {class: 'home'}) do = link_to dashboard_snippets_path, title: 'Your snippets', data: {placement: 'right'} do - Your Snippets + Your snippets = nav_link(page: explore_snippets_path) do = link_to explore_snippets_path, title: 'Explore snippets', data: {placement: 'right'} do - Explore Snippets + Explore snippets - if current_user .nav-controls.hidden-xs |