diff options
Diffstat (limited to 'app/controllers/admin')
5 files changed, 10 insertions, 14 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 786ba73a96f..56ec10fa43a 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -53,7 +53,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController def integrations return not_found unless instance_level_integrations? - @integrations = Service.find_or_initialize_all(Service.for_instance).sort_by(&:title) + @integrations = Service.find_or_initialize_all_non_project_specific(Service.for_instance).sort_by(&:title) end def update @@ -216,10 +216,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController remove_blank_params_for!(:elasticsearch_aws_secret_access_key, :eks_secret_access_key) - # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) - params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file] - params.delete(:domain_blacklist_raw) if params[:domain_blacklist] - params.delete(:domain_whitelist_raw) if params[:domain_whitelist] + # TODO Remove domain_denylist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) + params.delete(:domain_denylist_raw) if params[:domain_denylist_file] + params.delete(:domain_denylist_raw) if params[:domain_denylist] + params.delete(:domain_allowlist_raw) if params[:domain_allowlist] params.require(:application_setting).permit( visible_application_setting_attributes @@ -240,7 +240,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController *ApplicationSetting.repository_storages_weighted_attributes, :lets_encrypt_notification_email, :lets_encrypt_terms_of_service_accepted, - :domain_blacklist_file, + :domain_denylist_file, :raw_blob_request_limit, :issues_create_limit, :default_branch_name, diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index 7d981d67840..33a8cc4ae42 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -16,6 +16,7 @@ class Admin::DashboardController < Admin::ApplicationController @groups = Group.order_id_desc.with_route.limit(10) @notices = Gitlab::ConfigChecker::PumaRuggedChecker.check @notices += Gitlab::ConfigChecker::ExternalDatabaseChecker.check + @redis_versions = [Gitlab::Redis::Queues, Gitlab::Redis::SharedState, Gitlab::Redis::Cache].map(&:version).uniq end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/controllers/admin/instance_statistics_controller.rb b/app/controllers/admin/instance_statistics_controller.rb index dfbd704cb0c..05a0a1ce314 100644 --- a/app/controllers/admin/instance_statistics_controller.rb +++ b/app/controllers/admin/instance_statistics_controller.rb @@ -13,6 +13,6 @@ class Admin::InstanceStatisticsController < Admin::ApplicationController end def check_feature_flag - render_404 unless Feature.enabled?(:instance_statistics) + render_404 unless Feature.enabled?(:instance_statistics, default_enabled: true) end end diff --git a/app/controllers/admin/integrations_controller.rb b/app/controllers/admin/integrations_controller.rb index 9a1d5a11f7f..aab8705f5cb 100644 --- a/app/controllers/admin/integrations_controller.rb +++ b/app/controllers/admin/integrations_controller.rb @@ -8,8 +8,8 @@ class Admin::IntegrationsController < Admin::ApplicationController private - def find_or_initialize_integration(name) - Service.find_or_initialize_integration(name, instance: true) + def find_or_initialize_non_project_specific_integration(name) + Service.find_or_initialize_non_project_specific_integration(name, instance: true) end def integrations_enabled? diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index bd7b69384b2..2d0bb0bfebc 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -6,7 +6,6 @@ class Admin::UsersController < Admin::ApplicationController before_action :user, except: [:index, :new, :create] before_action :check_impersonation_availability, only: :impersonate before_action :ensure_destroy_prerequisites_met, only: [:destroy] - before_action :check_admin_approval_feature_available!, only: [:approve] feature_category :users @@ -298,10 +297,6 @@ class Admin::UsersController < Admin::ApplicationController def log_impersonation_event Gitlab::AppLogger.info(_("User %{current_user_username} has started impersonating %{username}") % { current_user_username: current_user.username, username: user.username }) end - - def check_admin_approval_feature_available! - access_denied! unless Feature.enabled?(:admin_approval_for_new_user_signups, default_enabled: true) - end end Admin::UsersController.prepend_if_ee('EE::Admin::UsersController') |