diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-08 21:50:44 +0300 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-08 21:50:44 +0300 |
commit | 59e47e67ea426df14dc0eb5c25073883a7d6d99c (patch) | |
tree | 7f8212bbb4d2571fa681f13ac466dfc3898dd5a0 /app/views/layouts | |
parent | 52080f74d42a62298654b8550e6dfbcd06de65a7 (diff) |
Fix merge conflicts from removing links from sidebar
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 2f956dbbd77..b73fde7797f 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -11,37 +11,23 @@ Todos = nav_link(path: 'dashboard#activity') do = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do - = icon('dashboard fw') - .nav-link-text - Activity - = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do - = link_to dashboard_groups_path, title: 'Groups' do - = icon('group fw') - .nav-link-text - Groups - = nav_link(controller: 'dashboard/milestones') do - = link_to dashboard_milestones_path, title: 'Milestones' do - = icon('clock-o fw') - .nav-link-text - Milestones - = nav_link(path: 'dashboard#issues') do - = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do = navbar_icon('activity') .nav-link-text Activity = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do = link_to dashboard_groups_path, title: 'Groups' do = navbar_icon('group') - %span + .nav-link-text Groups = nav_link(controller: 'dashboard/milestones') do = link_to dashboard_milestones_path, title: 'Milestones' do = navbar_icon('milestones') - %span + .nav-link-text Milestones = nav_link(path: 'dashboard#issues') do = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do = navbar_icon('issues') + .nav-link-text Issues = nav_link(path: 'dashboard#merge_requests') do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do |