diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-29 13:33:09 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-29 13:33:09 +0000 |
| commit | 2e8a3e3996f47a5b436bce9a6bbb61ca0a351cab (patch) | |
| tree | d5673a6760572942328a84c02868974911420ff6 | |
| parent | 2c3355f9584a1a22d91806b8b49d441f22c0c286 (diff) | |
| parent | abae352e59b3fe8574249041508afd68bff8bab2 (diff) | |
| download | gitlab-ce-2e8a3e3996f47a5b436bce9a6bbb61ca0a351cab.tar.gz | |
Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master'
Link directly to the projects page instead of the root controller
If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard.
Fixes bug introduced by !1446.
See merge request !1459
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 21d8655131f..b1a1d531846 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -1,6 +1,6 @@ %ul.nav.nav-sidebar = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: 'home'}) do - = link_to root_path, title: 'Projects', data: {placement: 'right'} do + = link_to dashboard_projects_path, title: 'Projects', data: {placement: 'right'} do = icon('home fw') %span Projects |