Commit 5e0a8126 authored by Robert Speicher's avatar Robert Speicher

Account for RootController for dashboard navigation and Dispatch JS

cherry-picked
parent bf44988a
...@@ -55,7 +55,7 @@ class Dispatcher ...@@ -55,7 +55,7 @@ class Dispatcher
when 'projects:merge_requests:index' when 'projects:merge_requests:index'
shortcut_handler = new ShortcutsNavigation() shortcut_handler = new ShortcutsNavigation()
MergeRequests.init() MergeRequests.init()
when 'dashboard:show' when 'dashboard:show', 'root:show'
new Dashboard() new Dashboard()
new Activities() new Activities()
when 'dashboard:projects:starred' when 'dashboard:projects:starred'
......
%ul.nav.nav-sidebar %ul.nav.nav-sidebar
= nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do = nav_link(path: ['dashboard#show', 'root#show'], html_options: {class: 'home'}) do
= link_to dashboard_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do = link_to dashboard_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
= icon('dashboard fw') = icon('dashboard fw')
%span %span
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment