diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-17 18:16:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-17 18:16:12 +0300 |
commit | 8432be20de0a29f4dde4980efe37d013c9e90034 (patch) | |
tree | af163db5a7c8ac17ca4da59d505c75552452956c /app/controllers | |
parent | dd33e917374b611cd5a596c7fa51b47af6e153f6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/work_items_hierarchy.rb | 15 | ||||
-rw-r--r-- | app/controllers/projects_controller.rb | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/app/controllers/concerns/work_items_hierarchy.rb b/app/controllers/concerns/work_items_hierarchy.rb new file mode 100644 index 00000000000..6008256408c --- /dev/null +++ b/app/controllers/concerns/work_items_hierarchy.rb @@ -0,0 +1,15 @@ +# 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_controller.rb b/app/controllers/projects_controller.rb index 04dde5ef7b2..27483d455b1 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -9,6 +9,7 @@ class ProjectsController < Projects::ApplicationController include RecordUserLastActivity include ImportUrlParams include FiltersEvents + include WorkItemsHierarchy prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) } @@ -52,6 +53,7 @@ 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] |