Add latest changes from gitlab-org/gitlab@master

7 files changed, 0 insertions, 12 deletions

diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 031ea8c5f76..80c0f986552 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1354,7 +1354,6 @@ Layout/LineLength:
     - 'ee/app/models/ee/merge_request_diff.rb'
     - 'ee/app/models/ee/milestone_release.rb'
     - 'ee/app/models/ee/namespace.rb'
-    - 'ee/app/models/ee/namespace/root_storage_size.rb'
     - 'ee/app/models/ee/packages/package_file.rb'
     - 'ee/app/models/ee/pages_deployment.rb'
     - 'ee/app/models/ee/project.rb'
@@ -2444,9 +2443,7 @@ Layout/LineLength:
     - 'ee/spec/models/ee/iterations/cadence_spec.rb'
     - 'ee/spec/models/ee/lfs_object_spec.rb'
     - 'ee/spec/models/ee/merge_request_diff_spec.rb'
-    - 'ee/spec/models/ee/namespace/root_storage_size_spec.rb'
     - 'ee/spec/models/ee/namespace/root_storage_statistics_spec.rb'
-    - 'ee/spec/models/ee/namespace_limit_spec.rb'
     - 'ee/spec/models/ee/namespace_spec.rb'
     - 'ee/spec/models/ee/namespace_statistics_spec.rb'
     - 'ee/spec/models/ee/preloaders/group_policy_preloader_spec.rb'
diff --git a/.rubocop_todo/layout/multiline_operation_indentation.yml b/.rubocop_todo/layout/multiline_operation_indentation.yml
index c67120a7951..cdfa560ef2e 100644
--- a/.rubocop_todo/layout/multiline_operation_indentation.yml
+++ b/.rubocop_todo/layout/multiline_operation_indentation.yml
@@ -55,7 +55,6 @@ Layout/MultilineOperationIndentation:
     - 'ee/app/models/approval_project_rule.rb'
     - 'ee/app/models/concerns/ee/issuable.rb'
     - 'ee/app/models/ee/namespace.rb'
-    - 'ee/app/models/ee/namespace/root_storage_size.rb'
     - 'ee/app/models/ee/project.rb'
     - 'ee/app/models/ee/user.rb'
     - 'ee/app/models/vulnerabilities/finding_signature.rb'
diff --git a/.rubocop_todo/rails/skips_model_validations.yml b/.rubocop_todo/rails/skips_model_validations.yml
index 5c573a484f6..8ef895ed562 100644
--- a/.rubocop_todo/rails/skips_model_validations.yml
+++ b/.rubocop_todo/rails/skips_model_validations.yml
@@ -299,7 +299,6 @@ Rails/SkipsModelValidations:
     - 'ee/spec/models/ee/groups/feature_setting_spec.rb'
     - 'ee/spec/models/ee/iteration_spec.rb'
     - 'ee/spec/models/ee/iterations/cadence_spec.rb'
-    - 'ee/spec/models/ee/namespace_limit_spec.rb'
     - 'ee/spec/models/ee/vulnerability_spec.rb'
     - 'ee/spec/models/geo_node_spec.rb'
     - 'ee/spec/models/geo_node_status_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index f29e7bb49ae..163533621a6 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -507,10 +507,7 @@ RSpec/ContextWording:
     - 'ee/spec/models/ee/incident_management/project_incident_management_setting_spec.rb'
     - 'ee/spec/models/ee/iteration_spec.rb'
     - 'ee/spec/models/ee/iterations/cadence_spec.rb'
-    - 'ee/spec/models/ee/namespace/root_storage_size_spec.rb'
-    - 'ee/spec/models/ee/namespace/storage/notification_spec.rb'
     - 'ee/spec/models/ee/namespace_ci_cd_setting_spec.rb'
-    - 'ee/spec/models/ee/namespace_limit_spec.rb'
     - 'ee/spec/models/ee/namespace_spec.rb'
     - 'ee/spec/models/ee/notification_setting_spec.rb'
     - 'ee/spec/models/ee/personal_access_token_spec.rb'
diff --git a/.rubocop_todo/rspec/scattered_let.yml b/.rubocop_todo/rspec/scattered_let.yml
index 22ee370523e..93f373b0a9e 100644
--- a/.rubocop_todo/rspec/scattered_let.yml
+++ b/.rubocop_todo/rspec/scattered_let.yml
@@ -41,7 +41,6 @@ RSpec/ScatteredLet:
     - 'ee/spec/models/ci/minutes/notification_spec.rb'
     - 'ee/spec/models/ci/pipeline_spec.rb'
     - 'ee/spec/models/ee/ci/build_dependencies_spec.rb'
-    - 'ee/spec/models/ee/namespace/root_storage_size_spec.rb'
     - 'ee/spec/models/label_note_spec.rb'
     - 'ee/spec/models/sca/license_compliance_spec.rb'
     - 'ee/spec/policies/merge_request_policy_spec.rb'
diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml
index 6d145f11579..e0747f232a1 100644
--- a/.rubocop_todo/style/class_and_module_children.yml
+++ b/.rubocop_todo/style/class_and_module_children.yml
@@ -479,8 +479,6 @@ Style/ClassAndModuleChildren:
     - 'ee/app/models/concerns/geo/syncable.rb'
     - 'ee/app/models/dast/profile_schedule.rb'
     - 'ee/app/models/ee/ci/job_artifact.rb'
-    - 'ee/app/models/ee/namespace/root_excess_storage_size.rb'
-    - 'ee/app/models/ee/namespace/root_storage_size.rb'
     - 'ee/app/models/elastic/reindexing_slice.rb'
     - 'ee/app/models/elastic/reindexing_subtask.rb'
     - 'ee/app/models/elastic/reindexing_task.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 1dfedcc91c0..60ef4238ebd 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -533,7 +533,6 @@ Style/IfUnlessModifier:
     - 'ee/app/models/ee/member.rb'
     - 'ee/app/models/ee/milestone_release.rb'
     - 'ee/app/models/ee/namespace.rb'
-    - 'ee/app/models/ee/namespace/root_storage_size.rb'
     - 'ee/app/models/ee/project.rb'
     - 'ee/app/models/ee/project_feature.rb'
     - 'ee/app/models/ee/project_team.rb'