Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 31 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index e1abbe78a5c..256e305eb89 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -1818,7 +1818,6 @@ Layout/ArgumentAlignment:
     - 'spec/graphql/types/current_user_todos_type_spec.rb'
     - 'spec/graphql/types/project_statistics_type_spec.rb'
     - 'spec/graphql/types/project_type_spec.rb'
-    - 'spec/graphql/types/root_storage_statistics_type_spec.rb'
     - 'spec/graphql/types/todo_type_spec.rb'
     - 'spec/initializers/00_rails_disable_joins_spec.rb'
     - 'spec/initializers/secret_token_spec.rb'
@@ -2113,7 +2112,6 @@ Layout/ArgumentAlignment:
     - 'spec/requests/api/graphql/mutations/todos/mark_done_spec.rb'
     - 'spec/requests/api/graphql/mutations/todos/restore_many_spec.rb'
     - 'spec/requests/api/graphql/mutations/todos/restore_spec.rb'
-    - 'spec/requests/api/graphql/namespace/root_storage_statistics_spec.rb'
     - 'spec/requests/api/graphql/packages/conan_spec.rb'
     - 'spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb'
     - 'spec/requests/api/graphql/project/issue/design_collection/version_spec.rb'
diff --git a/.rubocop_todo/lint/symbol_conversion.yml b/.rubocop_todo/lint/symbol_conversion.yml
index 794633121e3..147cd66f993 100644
--- a/.rubocop_todo/lint/symbol_conversion.yml
+++ b/.rubocop_todo/lint/symbol_conversion.yml
@@ -7,8 +7,6 @@ Lint/SymbolConversion:
     - 'app/helpers/environments_helper.rb'
     - 'app/helpers/tooling/visual_review_helper.rb'
     - 'app/services/google_cloud/create_cloudsql_instance_service.rb'
-    - 'app/services/packages/debian/generate_distribution_key_service.rb'
-    - 'app/services/packages/debian/process_changes_service.rb'
     - 'config/puma.rb'
     - 'ee/app/components/billing/plan_component.rb'
     - 'ee/app/controllers/projects/security/scanned_resources_controller.rb'
@@ -72,8 +70,6 @@ Lint/SymbolConversion:
     - 'spec/controllers/jira_connect/branches_controller_spec.rb'
     - 'spec/factories/ci/reports/codequality_degradations.rb'
     - 'spec/factories/evidences.rb'
-    - 'spec/factories/packages/helm/file_metadatum.rb'
-    - 'spec/factories/packages/npm/metadata.rb'
     - 'spec/features/file_uploads/graphql_add_design_spec.rb'
     - 'spec/features/projects/new_project_spec.rb'
     - 'spec/graphql/mutations/ci/job_token_scope/remove_project_spec.rb'
@@ -126,9 +122,6 @@ Lint/SymbolConversion:
     - 'spec/lib/service_ping/devops_report_spec.rb'
     - 'spec/models/integrations/prometheus_spec.rb'
     - 'spec/models/merge_request_diff_commit_spec.rb'
-    - 'spec/models/packages/helm/file_metadatum_spec.rb'
-    - 'spec/models/packages/npm/metadatum_spec.rb'
-    - 'spec/presenters/packages/npm/package_presenter_spec.rb'
     - 'spec/requests/api/admin/plan_limits_spec.rb'
     - 'spec/requests/api/ci/job_artifacts_spec.rb'
     - 'spec/requests/api/ci/runner/jobs_put_spec.rb'
@@ -158,4 +151,3 @@ Lint/SymbolConversion:
     - 'spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb'
     - 'spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb'
     - 'spec/workers/gitlab/github_gists_import/import_gist_worker_spec.rb'
-    - 'spec/workers/packages/go/sync_packages_worker_spec.rb'
diff --git a/.rubocop_todo/style/bare_percent_literals.yml b/.rubocop_todo/style/bare_percent_literals.yml
index 132f0854700..554dc64c39c 100644
--- a/.rubocop_todo/style/bare_percent_literals.yml
+++ b/.rubocop_todo/style/bare_percent_literals.yml
@@ -2,13 +2,6 @@
 # Cop supports --autocorrect.
 Style/BarePercentLiterals:
   Exclude:
-    - 'app/models/commit.rb'
-    - 'app/models/concerns/storage/legacy_namespace.rb'
-    - 'app/models/integrations/datadog.rb'
-    - 'app/services/feature_flags/base_service.rb'
-    - 'app/services/repositories/base_service.rb'
-    - 'ee/app/services/jira/jql_builder_service.rb'
-    - 'ee/lib/ee/gitlab/checks/push_rules/file_size_check.rb'
     - 'ee/spec/features/projects/environments/environments_spec.rb'
     - 'ee/spec/helpers/subscriptions_helper_spec.rb'
     - 'ee/spec/lib/banzai/filter/references/iteration_reference_filter_spec.rb'
@@ -16,18 +9,6 @@ Style/BarePercentLiterals:
     - 'ee/spec/lib/gitlab/status_page/filter/image_filter_spec.rb'
     - 'ee/spec/requests/api/ci/jobs_spec.rb'
     - 'ee/spec/services/geo/container_repository_sync_spec.rb'
-    - 'lib/banzai/filter/autolink_filter.rb'
-    - 'lib/banzai/filter/references/reference_filter.rb'
-    - 'lib/banzai/filter/spaced_link_filter.rb'
-    - 'lib/banzai/filter/table_of_contents_filter.rb'
-    - 'lib/banzai/issuable_extractor.rb'
-    - 'lib/gitlab/authorized_keys.rb'
-    - 'lib/gitlab/etag_caching/middleware.rb'
-    - 'lib/gitlab/etag_caching/router/rails.rb'
-    - 'lib/gitlab/gl_repository/identifier.rb'
-    - 'lib/gitlab/import_export/repo_restorer.rb'
-    - 'lib/kramdown/parser/atlassian_document_format.rb'
-    - 'lib/tasks/tanuki_emoji.rake'
     - 'qa/qa/ee/page/dashboard/projects.rb'
     - 'qa/qa/ee/page/group/settings/general.rb'
     - 'qa/qa/ee/page/project/issue/show.rb'
@@ -46,8 +27,6 @@ Style/BarePercentLiterals:
     - 'qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb'
     - 'qa/spec/runtime/feature_spec.rb'
-    - 'scripts/regenerate-schema'
-    - 'scripts/trigger-build.rb'
     - 'spec/controllers/import/fogbugz_controller_spec.rb'
     - 'spec/controllers/projects/artifacts_controller_spec.rb'
     - 'spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb'