diff options
Diffstat (limited to 'app/controllers/admin')
7 files changed, 26 insertions, 12 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 7960e5d64d0..8039fac02ec 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -2,7 +2,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController include InternalRedirect - include ServicesHelper + include IntegrationsHelper # NOTE: Use @application_setting in this controller when you need to access # application_settings after it has been modified. This is because the @@ -27,7 +27,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController feature_category :source_code_management, [:repository, :clear_repository_check_states] feature_category :continuous_integration, [:ci_cd, :reset_registration_token] - feature_category :usage_ping, [:usage_data] + feature_category :service_ping, [:usage_data] feature_category :integrations, [:integrations] feature_category :pages, [:lets_encrypt_terms_of_service] @@ -207,6 +207,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end params[:application_setting][:import_sources]&.delete("") + params[:application_setting][:valid_runner_registrars]&.delete("") params[:application_setting][:restricted_visibility_levels]&.delete("") if params[:application_setting].key?(:required_instance_ci_template) @@ -245,7 +246,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController disabled_oauth_sign_in_sources: [], import_sources: [], restricted_visibility_levels: [], - repository_storages_weighted: {} + repository_storages_weighted: {}, + valid_runner_registrars: [] ] end diff --git a/app/controllers/admin/background_migrations_controller.rb b/app/controllers/admin/background_migrations_controller.rb index c1dffbf423d..65b47308e4c 100644 --- a/app/controllers/admin/background_migrations_controller.rb +++ b/app/controllers/admin/background_migrations_controller.rb @@ -15,6 +15,20 @@ class Admin::BackgroundMigrationsController < Admin::ApplicationController @successful_rows_counts = batched_migration_class.successful_rows_counts(@migrations.map(&:id)) end + def pause + migration = batched_migration_class.find(params[:id]) + migration.paused! + + redirect_back fallback_location: { action: 'index' } + end + + def resume + migration = batched_migration_class.find(params[:id]) + migration.active! + + redirect_back fallback_location: { action: 'index' } + end + private def batched_migration_class diff --git a/app/controllers/admin/ci/variables_controller.rb b/app/controllers/admin/ci/variables_controller.rb index f30ee37fa58..d4b7d750759 100644 --- a/app/controllers/admin/ci/variables_controller.rb +++ b/app/controllers/admin/ci/variables_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::Ci::VariablesController < Admin::ApplicationController - feature_category :continuous_integration + feature_category :pipeline_authoring def show respond_to do |format| diff --git a/app/controllers/admin/cohorts_controller.rb b/app/controllers/admin/cohorts_controller.rb index 8163f062b62..e750b5c5ad4 100644 --- a/app/controllers/admin/cohorts_controller.rb +++ b/app/controllers/admin/cohorts_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::CohortsController < Admin::ApplicationController - include Analytics::UniqueVisitsHelper + include RedisTracking feature_category :devops_reports @@ -21,8 +21,6 @@ class Admin::CohortsController < Admin::ApplicationController end def track_cohorts_visit - if request.format.html? && request.headers['DNT'] != '1' - track_visit('i_analytics_cohorts') - end + track_unique_redis_hll_event('i_analytics_cohorts') if trackable_html_request? end end diff --git a/app/controllers/admin/integrations_controller.rb b/app/controllers/admin/integrations_controller.rb index 316e6d9aa74..76c1c46e0e8 100644 --- a/app/controllers/admin/integrations_controller.rb +++ b/app/controllers/admin/integrations_controller.rb @@ -2,7 +2,7 @@ class Admin::IntegrationsController < Admin::ApplicationController include IntegrationsActions - include ServicesHelper + include IntegrationsHelper before_action :not_found, unless: -> { instance_level_integrations? } diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb index bf9cfa3acff..d1c91d9617f 100644 --- a/app/controllers/admin/runners_controller.rb +++ b/app/controllers/admin/runners_controller.rb @@ -8,7 +8,7 @@ class Admin::RunnersController < Admin::ApplicationController push_frontend_feature_flag(:runner_list_view_vue_ui, current_user, default_enabled: :yaml) end - feature_category :continuous_integration + feature_category :runner NUMBER_OF_RUNNERS_PER_PAGE = 30 diff --git a/app/controllers/admin/usage_trends_controller.rb b/app/controllers/admin/usage_trends_controller.rb index 7073f71a1a8..0b315517594 100644 --- a/app/controllers/admin/usage_trends_controller.rb +++ b/app/controllers/admin/usage_trends_controller.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true class Admin::UsageTrendsController < Admin::ApplicationController - include Analytics::UniqueVisitsHelper + include RedisTracking - track_unique_visits :index, target_id: 'i_analytics_instance_statistics' + track_redis_hll_event :index, name: 'i_analytics_instance_statistics' feature_category :devops_reports |