Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 24 deletions

diff --git a/app/views/layouts/nav/sidebar/_analytics_links.html.haml b/app/views/layouts/nav/sidebar/_analytics_links.html.haml
deleted file mode 100644
index 92a7b97203f..00000000000
--- a/app/views/layouts/nav/sidebar/_analytics_links.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-- navbar_links = links.sort_by(&:title)
-- all_paths = navbar_links.map(&:path)
-- analytics_link = navbar_links.find { |link| link.title == _('Value stream') } || navbar_links.first
-
-- if navbar_links.any?
-  = nav_link(path: all_paths) do
-    = link_to analytics_link.link, {class: 'shortcuts-analytics has-sub-items', data: { qa_selector: 'analytics_anchor' } } do
-      .nav-icon-container
-        = sprite_icon('chart')
-      %span.nav-item-name{ data: { qa_selector: 'analytics_link' } }
-        = _('Analytics')
-
-    %ul.sidebar-sub-level-items{ data: { qa_selector: 'analytics_sidebar_submenu' } }
-      = nav_link(path: analytics_link.path, html_options: { class: "fly-out-top-item" } ) do
-        = link_to analytics_link.link do
-          %strong.fly-out-top-item-name
-            = _('Analytics')
-      %li.divider.fly-out-top-item
-      - navbar_links.each do |menu_item|
-        = nav_link(path: menu_item.path) do
-          = link_to(menu_item.link, menu_item.link_to_options) do
-            %span= menu_item.title
diff --git a/app/views/layouts/nav/sidebar/_group_menus.html.haml b/app/views/layouts/nav/sidebar/_group_menus.html.haml
index 2eea076f8db..8a6183f8efe 100644
--- a/app/views/layouts/nav/sidebar/_group_menus.html.haml
+++ b/app/views/layouts/nav/sidebar/_group_menus.html.haml
@@ -1,5 +1,3 @@
-= render 'layouts/nav/sidebar/analytics_links', links: group_analytics_navbar_links(@group, current_user)
-
 - if group_sidebar_link?(:wiki)
   = render 'layouts/nav/sidebar/wiki_link', wiki_url: @group.wiki.web_url