Merge branch 'fix-duplicate-links-in-project-sidebar' into 'master'

Fixed a bad conflict resolution that caused duplicated links in project sidebar

See merge request !2593

app/views/layouts/nav/_new_project_sidebar.html.haml

@@ -100,15 +100,6 @@
             = link_to project_boards_path(@project), title: 'Boards' do
               %span
                 Boards
-          = nav_link(controller: :issues) do
-            = link_to project_issues_path(@project), title: 'Issues' do
-              %span
-                List
-
-          = nav_link(controller: :boards) do
-            = link_to project_boards_path(@project), title: 'Board' do
-              %span
-                Board
 
           = nav_link(controller: :labels) do
             = link_to project_labels_path(@project), title: 'Labels' do