diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-10 04:36:09 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-16 12:51:56 -0400 |
| commit | 5e0a812669382a18d2688854cb14755078c44eea (patch) | |
| tree | b479583ea8e504d06921b82cedab92cb00e681ef | |
| parent | bf44988a302499cb85d070ace355d3915ecd284b (diff) | |
| download | gitlab-ce-5e0a812669382a18d2688854cb14755078c44eea.tar.gz | |
Account for RootController for dashboard navigation and Dispatch JS
cherry-picked
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index da56e3cdbc8..b7ebe6a5c89 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -55,7 +55,7 @@ class Dispatcher when 'projects:merge_requests:index' shortcut_handler = new ShortcutsNavigation() MergeRequests.init() - when 'dashboard:show' + when 'dashboard:show', 'root:show' new Dashboard() new Activities() when 'dashboard:projects:starred' diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 83e6fe863f9..687c1fc3dd2 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -1,5 +1,5 @@ %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 = icon('dashboard fw') %span |