diff options
Diffstat (limited to 'app/controllers/groups')
4 files changed, 9 insertions, 4 deletions
diff --git a/app/controllers/groups/autocomplete_sources_controller.rb b/app/controllers/groups/autocomplete_sources_controller.rb index 6936733c4f7..3cad9e1fbad 100644 --- a/app/controllers/groups/autocomplete_sources_controller.rb +++ b/app/controllers/groups/autocomplete_sources_controller.rb @@ -46,6 +46,8 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def target + # TODO https://gitlab.com/gitlab-org/gitlab/-/issues/388541 + # type_id is a misnomer. QuickActions::TargetService actually requires an iid. QuickActions::TargetService .new(nil, current_user, group: @group) .execute(params[:type], params[:type_id]) diff --git a/app/controllers/groups/email_campaigns_controller.rb b/app/controllers/groups/email_campaigns_controller.rb index 38087e3fc11..8ae429de490 100644 --- a/app/controllers/groups/email_campaigns_controller.rb +++ b/app/controllers/groups/email_campaigns_controller.rb @@ -3,7 +3,7 @@ class Groups::EmailCampaignsController < Groups::ApplicationController EMAIL_CAMPAIGNS_SCHEMA_URL = 'iglu:com.gitlab/email_campaigns/jsonschema/1-0-0' - feature_category :navigation + feature_category :experimentation_activation urgency :low before_action :check_params @@ -44,7 +44,7 @@ class Groups::EmailCampaignsController < Groups::ApplicationController when :team, :team_short group_group_members_url(group) when :admin_verify - project_settings_ci_cd_path(group.projects.first, ci_runner_templates: true, anchor: 'js-runners-settings') + project_settings_ci_cd_path(group.projects.first, anchor: 'js-runners-settings') end end diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb index 18b055b3f05..859bb0adb4e 100644 --- a/app/controllers/groups/runners_controller.rb +++ b/app/controllers/groups/runners_controller.rb @@ -9,8 +9,6 @@ class Groups::RunnersController < Groups::ApplicationController urgency :low def index - finder = Ci::RunnersFinder.new(current_user: current_user, params: { group: @group }) - @group_runners_limited_count = finder.execute.except(:limit, :offset).page.total_count_with_limit(:all, limit: 1000) @group_runner_registration_token = @group.runners_token if can?(current_user, :register_group_runners, group) Gitlab::Tracking.event(self.class.name, 'index', user: current_user, namespace: @group) diff --git a/app/controllers/groups/usage_quotas_controller.rb b/app/controllers/groups/usage_quotas_controller.rb index b660eb3af99..4f858cd130a 100644 --- a/app/controllers/groups/usage_quotas_controller.rb +++ b/app/controllers/groups/usage_quotas_controller.rb @@ -4,6 +4,7 @@ module Groups class UsageQuotasController < Groups::ApplicationController before_action :authorize_read_usage_quotas! before_action :verify_usage_quotas_enabled! + before_action :push_frontend_feature_flags feature_category :subscription_cost_management urgency :low @@ -15,6 +16,10 @@ module Groups private + def push_frontend_feature_flags + push_frontend_feature_flag(:usage_quotas_for_all_editions, @group) + end + def verify_usage_quotas_enabled! render_404 unless group.usage_quotas_enabled? end |