diff options
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index b53d9b1be04..995d5abf045 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -15,7 +15,6 @@ class GroupsController < Groups::ApplicationController prepend_before_action(only: [:show, :issues]) { authenticate_sessionless_user!(:rss) } prepend_before_action(only: [:issues_calendar]) { authenticate_sessionless_user!(:ics) } - prepend_before_action :ensure_export_enabled, only: [:export, :download_export] prepend_before_action :check_captcha, only: :create, if: -> { captcha_enabled? } before_action :authenticate_user!, only: [:new, :create] @@ -33,7 +32,6 @@ class GroupsController < Groups::ApplicationController before_action do push_frontend_feature_flag(:vue_issues_list, @group, default_enabled: :yaml) - push_frontend_feature_flag(:iteration_cadences, @group, default_enabled: :yaml) end before_action :check_export_rate_limit!, only: [:export, :download_export] @@ -61,7 +59,8 @@ class GroupsController < Groups::ApplicationController feature_category :importers, [:export, :download_export] urgency :high, [:unfoldered_environment_names] - urgency :low, [:merge_requests] + # TODO: Set #show to higher urgency after resolving https://gitlab.com/gitlab-org/gitlab/-/issues/334795 + urgency :low, [:merge_requests, :show] def index redirect_to(current_user ? dashboard_groups_path : explore_groups_path) @@ -218,6 +217,8 @@ class GroupsController < Groups::ApplicationController @has_projects = group_projects.exists? + set_sort_order + respond_to do |format| format.html end @@ -293,7 +294,7 @@ class GroupsController < Groups::ApplicationController :setup_for_company, :jobs_to_be_done, :crm_enabled - ] + ] + [group_feature_attributes: group_feature_attributes] end # rubocop: disable CodeReuse/ActiveRecord @@ -338,10 +339,6 @@ class GroupsController < Groups::ApplicationController check_rate_limit!(prefixed_action, scope: [current_user, scope].compact) end - def ensure_export_enabled - render_404 unless Feature.enabled?(:group_import_export, @group, default_enabled: true) - end - private def load_recaptcha @@ -400,6 +397,10 @@ class GroupsController < Groups::ApplicationController experiment(:require_verification_for_namespace_creation, user: current_user).track(:start_create_group) end + + def group_feature_attributes + [] + end end GroupsController.prepend_mod_with('GroupsController') |