Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 29 deletions

diff --git a/lib/sidebars/concerns/work_item_hierarchy.rb b/lib/sidebars/concerns/work_item_hierarchy.rb
deleted file mode 100644
index a4153bb5120..00000000000
--- a/lib/sidebars/concerns/work_item_hierarchy.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# This module has the necessary methods to render
-# work items hierarchy menu
-module Sidebars
-  module Concerns
-    module WorkItemHierarchy
-      def hierarchy_menu_item(container, url, path)
-        unless show_hierarachy_menu_item?(container)
-          return ::Sidebars::NilMenuItem.new(item_id: :hierarchy)
-        end
-
-        ::Sidebars::MenuItem.new(
-          title: _('Planning hierarchy'),
-          link: url,
-          active_routes: { path: path },
-          item_id: :hierarchy
-        )
-      end
-
-      def show_hierarachy_menu_item?(container)
-        can?(context.current_user, :read_planning_hierarchy, container)
-      end
-    end
-  end
-end
diff --git a/lib/sidebars/projects/menus/project_information_menu.rb b/lib/sidebars/projects/menus/project_information_menu.rb
index 4056d50d324..44b94ee3522 100644
--- a/lib/sidebars/projects/menus/project_information_menu.rb
+++ b/lib/sidebars/projects/menus/project_information_menu.rb
@@ -4,13 +4,10 @@ module Sidebars
   module Projects
     module Menus
       class ProjectInformationMenu < ::Sidebars::Menu
-        include ::Sidebars::Concerns::WorkItemHierarchy
-
         override :configure_menu_items
         def configure_menu_items
           add_item(activity_menu_item)
           add_item(labels_menu_item)
-          add_item(hierarchy_menu_item(context.project, project_planning_hierarchy_path(context.project), 'projects#planning_hierarchy'))
           add_item(members_menu_item)
 
           true