diff options
Diffstat (limited to 'app/controllers/admin')
13 files changed, 28 insertions, 20 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index a680c1f4517..75d1e4bf6a0 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -13,7 +13,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController before_action :disable_query_limiting, only: [:usage_data] - feature_category :not_owned, [ + feature_category :not_owned, [ # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned :general, :reporting, :metrics_and_profiling, :network, :preferences, :update, :reset_health_check_token ] @@ -53,6 +53,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end def service_usage_data + @service_ping_data_present = Rails.cache.exist?('usage_data') end def update diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb index d4b906d5e33..4eda35d66f6 100644 --- a/app/controllers/admin/background_jobs_controller.rb +++ b/app/controllers/admin/background_jobs_controller.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class Admin::BackgroundJobsController < Admin::ApplicationController - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned end diff --git a/app/controllers/admin/background_migrations_controller.rb b/app/controllers/admin/background_migrations_controller.rb index e21e6fd2dcb..42b89a3317e 100644 --- a/app/controllers/admin/background_migrations_controller.rb +++ b/app/controllers/admin/background_migrations_controller.rb @@ -6,8 +6,8 @@ class Admin::BackgroundMigrationsController < Admin::ApplicationController def index @relations_by_tab = { 'queued' => batched_migration_class.queued.queue_order, - 'failed' => batched_migration_class.failed.queue_order, - 'finished' => batched_migration_class.finished.queue_order.reverse_order + 'failed' => batched_migration_class.with_status(:failed).queue_order, + 'finished' => batched_migration_class.with_status(:finished).queue_order.reverse_order } @current_tab = @relations_by_tab.key?(params[:tab]) ? params[:tab] : 'queued' @@ -17,14 +17,14 @@ class Admin::BackgroundMigrationsController < Admin::ApplicationController def pause migration = batched_migration_class.find(params[:id]) - migration.paused! + migration.pause! redirect_back fallback_location: { action: 'index' } end def resume migration = batched_migration_class.find(params[:id]) - migration.active! + migration.execute! redirect_back fallback_location: { action: 'index' } end diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb index ef843a84e6c..8b672929f88 100644 --- a/app/controllers/admin/broadcast_messages_controller.rb +++ b/app/controllers/admin/broadcast_messages_controller.rb @@ -45,8 +45,8 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController end def preview - broadcast_message = BroadcastMessage.new(broadcast_message_params) - render json: { message: render_broadcast_message(broadcast_message) } + @broadcast_message = BroadcastMessage.new(broadcast_message_params) + render partial: 'admin/broadcast_messages/preview' end protected @@ -58,8 +58,8 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController def broadcast_message_params params.require(:broadcast_message).permit(%i( color + theme ends_at - font message starts_at target_path diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index d12ccfc7423..20e36e5fd84 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -5,7 +5,7 @@ class Admin::DashboardController < Admin::ApplicationController COUNTED_ITEMS = [Project, User, Group].freeze - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned # rubocop: disable CodeReuse/ActiveRecord def index diff --git a/app/controllers/admin/health_check_controller.rb b/app/controllers/admin/health_check_controller.rb index 5733929c25e..3614f83723d 100644 --- a/app/controllers/admin/health_check_controller.rb +++ b/app/controllers/admin/health_check_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::HealthCheckController < Admin::ApplicationController - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned def show @errors = HealthCheck::Utils.process_checks(checks) diff --git a/app/controllers/admin/integrations_controller.rb b/app/controllers/admin/integrations_controller.rb index db9835e65ec..ad0ee0b2cef 100644 --- a/app/controllers/admin/integrations_controller.rb +++ b/app/controllers/admin/integrations_controller.rb @@ -5,10 +5,6 @@ class Admin::IntegrationsController < Admin::ApplicationController before_action :not_found, unless: -> { instance_level_integrations? } - before_action do - push_frontend_feature_flag(:integration_form_sections, default_enabled: :yaml) - end - feature_category :integrations def overrides diff --git a/app/controllers/admin/plan_limits_controller.rb b/app/controllers/admin/plan_limits_controller.rb index 420fd93fad5..7bfbabe8dfc 100644 --- a/app/controllers/admin/plan_limits_controller.rb +++ b/app/controllers/admin/plan_limits_controller.rb @@ -5,7 +5,7 @@ class Admin::PlanLimitsController < Admin::ApplicationController before_action :set_plan_limits - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned def create redirect_path = referer_path(request) || general_admin_application_settings_path @@ -38,6 +38,14 @@ class Admin::PlanLimitsController < Admin::ApplicationController pypi_max_file_size terraform_module_max_file_size generic_packages_max_file_size + ci_pipeline_size + ci_active_jobs + ci_active_pipelines + ci_project_subscriptions + ci_pipeline_schedules + ci_needs_size_limit + ci_registered_group_runners + ci_registered_project_runners ]) end end diff --git a/app/controllers/admin/requests_profiles_controller.rb b/app/controllers/admin/requests_profiles_controller.rb index fbbe8c24637..b60cb7ff9c2 100644 --- a/app/controllers/admin/requests_profiles_controller.rb +++ b/app/controllers/admin/requests_profiles_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::RequestsProfilesController < Admin::ApplicationController - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned def index @profile_token = Gitlab::RequestProfiler.profile_token diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb index 2744be0150c..06880ace899 100644 --- a/app/controllers/admin/runners_controller.rb +++ b/app/controllers/admin/runners_controller.rb @@ -4,6 +4,9 @@ class Admin::RunnersController < Admin::ApplicationController include RunnerSetupScripts before_action :runner, except: [:index, :tag_list, :runner_setup_scripts] + before_action only: [:index] do + push_frontend_feature_flag(:admin_runners_bulk_delete, default_enabled: :yaml) + end feature_category :runner diff --git a/app/controllers/admin/spam_logs_controller.rb b/app/controllers/admin/spam_logs_controller.rb index 67d991c8b03..e4e866a8b60 100644 --- a/app/controllers/admin/spam_logs_controller.rb +++ b/app/controllers/admin/spam_logs_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::SpamLogsController < Admin::ApplicationController - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned # rubocop: disable CodeReuse/ActiveRecord def index diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb index f14305528a3..7ae930abb84 100644 --- a/app/controllers/admin/system_info_controller.rb +++ b/app/controllers/admin/system_info_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::SystemInfoController < Admin::ApplicationController - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned EXCLUDED_MOUNT_OPTIONS = %w[ nobrowse diff --git a/app/controllers/admin/version_check_controller.rb b/app/controllers/admin/version_check_controller.rb index dde1a7abafa..f5c70dc9e1b 100644 --- a/app/controllers/admin/version_check_controller.rb +++ b/app/controllers/admin/version_check_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::VersionCheckController < Admin::ApplicationController - feature_category :not_owned + feature_category :not_owned # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned def version_check response = VersionCheck.new.response |