Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

2 files changed, 0 insertions, 20 deletions

diff --git a/.rubocop_todo/naming/heredoc_delimiter_naming.yml b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
index ae71e06b6d3..9b6d26a53ca 100644
--- a/.rubocop_todo/naming/heredoc_delimiter_naming.yml
+++ b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
@@ -8,7 +8,6 @@ Naming/HeredocDelimiterNaming:
     - 'app/services/packages/debian/generate_distribution_key_service.rb'
     - 'app/workers/concerns/limited_capacity/job_tracker.rb'
     - 'config/initializers/01_secret_token.rb'
-    - 'ee/app/workers/update_max_seats_used_for_gitlab_com_subscriptions_worker.rb'
     - 'ee/db/geo/migrate/20180322062741_migrate_ci_job_artifacts_to_separate_registry.rb'
     - 'ee/db/geo/migrate/20191010204941_migrate_lfs_objects_to_separate_registry.rb'
     - 'ee/lib/api/elasticsearch_indexed_namespaces.rb'
@@ -50,16 +49,13 @@ Naming/HeredocDelimiterNaming:
     - 'rubocop/cop/default_scope.rb'
     - 'rubocop/cop/file_decompression.rb'
     - 'rubocop/cop/gitlab/httparty.rb'
-    - 'rubocop/cop/gitlab/json.rb'
     - 'rubocop/cop/gitlab/module_with_instance_variables.rb'
     - 'rubocop/cop/gitlab/predicate_memoization.rb'
     - 'spec/controllers/projects/pipelines_controller_spec.rb'
     - 'spec/deprecation_toolkit_env.rb'
-    - 'spec/factories/packages/debian/file_metadatum.rb'
     - 'spec/features/projects/commit/user_comments_on_commit_spec.rb'
     - 'spec/features/task_lists_spec.rb'
     - 'spec/initializers/100_patch_omniauth_oauth2_spec.rb'
-    - 'spec/initializers/net_http_response_patch_spec.rb'
     - 'spec/initializers/rack_multipart_patch_spec.rb'
     - 'spec/initializers/secret_token_spec.rb'
     - 'spec/initializers/validate_database_config_spec.rb'
@@ -86,14 +82,6 @@ Naming/HeredocDelimiterNaming:
     - 'spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb'
     - 'spec/lib/gitlab/import_export/attributes_permitter_spec.rb'
     - 'spec/lib/gitlab/import_export/config_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v2/delete_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v2/init_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v2/install_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v2/patch_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v2/reset_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v3/delete_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v3/install_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v3/patch_command_spec.rb'
     - 'spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb'
     - 'spec/lib/gitlab/patch/database_config_spec.rb'
     - 'spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb'
diff --git a/.rubocop_todo/naming/inclusive_language.yml b/.rubocop_todo/naming/inclusive_language.yml
index 953e1a6e508..465e338bbe7 100644
--- a/.rubocop_todo/naming/inclusive_language.yml
+++ b/.rubocop_todo/naming/inclusive_language.yml
@@ -1,9 +1,7 @@
 ---
 Naming/InclusiveLanguage:
-  Details: grace period
   Exclude:
     - 'app/controllers/admin/application_settings/appearances_controller.rb'
-    - 'app/controllers/application_controller.rb'
     - 'app/controllers/concerns/requires_whitelisted_monitoring_client.rb'
     - 'app/controllers/health_check_controller.rb'
     - 'app/controllers/health_controller.rb'
@@ -13,7 +11,6 @@ Naming/InclusiveLanguage:
     - 'app/helpers/markup_helper.rb'
     - 'app/models/application_setting.rb'
     - 'app/models/application_setting_implementation.rb'
-    - 'app/models/clusters/applications/jupyter.rb'
     - 'app/models/concerns/cache_markdown_field.rb'
     - 'app/services/application_settings/update_service.rb'
     - 'app/services/projects/download_service.rb'
@@ -37,7 +34,6 @@ Naming/InclusiveLanguage:
     - 'lib/api/settings.rb'
     - 'lib/banzai/filter/asset_proxy_filter.rb'
     - 'lib/gitlab/asset_proxy.rb'
-    - 'lib/gitlab/auth.rb'
     - 'lib/gitlab/auth/ip_rate_limiter.rb'
     - 'lib/gitlab/ci/config/external/file/base.rb'
     - 'lib/gitlab/git/hook_env.rb'
@@ -45,7 +41,6 @@ Naming/InclusiveLanguage:
     - 'lib/gitlab/markdown_cache/active_record/extension.rb'
     - 'lib/gitlab/markdown_cache/field_data.rb'
     - 'lib/gitlab/middleware/basic_health_check.rb'
-    - 'lib/gitlab/middleware/go.rb'
     - 'lib/gitlab/sanitizers/exif.rb'
     - 'lib/gitlab/sanitizers/svg.rb'
     - 'lib/gitlab/sanitizers/svg/whitelist.rb'
@@ -61,7 +56,6 @@ Naming/InclusiveLanguage:
     - 'rubocop/cop/ignored_columns.rb'
     - 'rubocop/cop/inject_enterprise_edition_module.rb'
     - 'rubocop/cop/migration/add_columns_to_wide_tables.rb'
-    - 'spec/controllers/application_controller_spec.rb'
     - 'spec/controllers/concerns/issuable_collections_spec.rb'
     - 'spec/controllers/health_check_controller_spec.rb'
     - 'spec/controllers/metrics_controller_spec.rb'
@@ -70,7 +64,6 @@ Naming/InclusiveLanguage:
     - 'spec/lib/banzai/filter/asset_proxy_filter_spec.rb'
     - 'spec/lib/gitlab/asset_proxy_spec.rb'
     - 'spec/lib/gitlab/auth/ip_rate_limiter_spec.rb'
-    - 'spec/lib/gitlab/auth_spec.rb'
     - 'spec/lib/gitlab/git/hook_env_spec.rb'
     - 'spec/lib/gitlab/github_import/markdown/attachment_spec.rb'
     - 'spec/lib/gitlab/import_export/attribute_configuration_spec.rb'
@@ -81,7 +74,6 @@ Naming/InclusiveLanguage:
     - 'spec/lib/gitlab/sanitizers/exif_spec.rb'
     - 'spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb'
     - 'spec/models/application_setting_spec.rb'
-    - 'spec/models/clusters/applications/jupyter_spec.rb'
     - 'spec/requests/api/settings_spec.rb'
     - 'spec/requests/health_controller_spec.rb'
     - 'spec/rubocop/cop/avoid_return_from_blocks_spec.rb'