Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 17 deletions

diff --git a/app/controllers/concerns/work_items_hierarchy.rb b/app/controllers/concerns/work_items_hierarchy.rb
deleted file mode 100644
index 6008256408c..00000000000
--- a/app/controllers/concerns/work_items_hierarchy.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module WorkItemsHierarchy
-  extend ActiveSupport::Concern
-
-  # rubocop:disable Gitlab/ModuleWithInstanceVariables
-  def planning_hierarchy
-    return render_404 unless Feature.enabled?(:work_items_hierarchy, @project, default_enabled: :yaml)
-
-    render 'shared/planning_hierarchy'
-  end
-  # rubocop:enable Gitlab/ModuleWithInstanceVariables
-end
-
-WorkItemsHierarchy.prepend_mod_with('WorkItemsHierarchy')
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index 482ae2c35f5..c48f3352530 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -6,6 +6,7 @@ class Projects::TreeController < Projects::ApplicationController
   include CreatesCommit
   include ActionView::Helpers::SanitizeHelper
   include RedirectsForMissingPathOnTree
+  include SourcegraphDecorator
 
   around_action :allow_gitaly_ref_name_caching, only: [:show]
 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 27483d455b1..369fdbee089 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -9,7 +9,7 @@ class ProjectsController < Projects::ApplicationController
   include RecordUserLastActivity
   include ImportUrlParams
   include FiltersEvents
-  include WorkItemsHierarchy
+  include SourcegraphDecorator
 
   prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) }
 
@@ -53,7 +53,6 @@ class ProjectsController < Projects::ApplicationController
   feature_category :team_planning, [:preview_markdown, :new_issuable_address]
   feature_category :importers, [:export, :remove_export, :generate_new_export, :download_export]
   feature_category :code_review, [:unfoldered_environment_names]
-  feature_category :portfolio_management, [:planning_hierarchy]
 
   urgency :low, [:refs]
   urgency :high, [:unfoldered_environment_names]