Add latest changes from gitlab-org/gitlab@master

4 files changed, 0 insertions, 12 deletions

diff --git a/.rubocop_todo/rails/file_path.yml b/.rubocop_todo/rails/file_path.yml
index 0a652631e0b..2b01db2e440 100644
--- a/.rubocop_todo/rails/file_path.yml
+++ b/.rubocop_todo/rails/file_path.yml
@@ -8,8 +8,6 @@ Rails/FilePath:
     - 'app/models/concerns/cross_database_modification.rb'
     - 'app/models/release_highlight.rb'
     - 'app/serializers/review_app_setup_entity.rb'
-    - 'app/services/clusters/aws/fetch_credentials_service.rb'
-    - 'app/services/clusters/aws/provision_service.rb'
     - 'app/services/metrics/sample_metrics_service.rb'
     - 'app/services/projects/readme_renderer_service.rb'
     - 'config/environments/development.rb'
@@ -17,7 +15,6 @@ Rails/FilePath:
     - 'config/initializers/7_prometheus_metrics.rb'
     - 'config/initializers/lograge.rb'
     - 'config/initializers_before_autoloader/001_fast_gettext.rb'
-    - 'db/migrate/20210517144856_require_snapshot_namespace.rb'
     - 'db/post_migrate/20210630025020_migrate_push_event_payloads_event_id_back_to_integer_for_gitlab_com.rb'
     - 'ee/app/helpers/ee/application_helper.rb'
     - 'ee/app/services/security/security_orchestration_policies/project_create_service.rb'
@@ -126,8 +123,6 @@ Rails/FilePath:
     - 'spec/requests/api/internal/mail_room_spec.rb'
     - 'spec/requests/api/usage_data_queries_spec.rb'
     - 'spec/serializers/review_app_setup_entity_spec.rb'
-    - 'spec/services/clusters/aws/fetch_credentials_service_spec.rb'
-    - 'spec/services/clusters/aws/provision_service_spec.rb'
     - 'spec/services/metrics/sample_metrics_service_spec.rb'
     - 'spec/support/helpers/doc_url_helper.rb'
     - 'spec/support/helpers/test_env.rb'
diff --git a/.rubocop_todo/rails/inverse_of.yml b/.rubocop_todo/rails/inverse_of.yml
index 832767b7bb5..5ec863fdb25 100644
--- a/.rubocop_todo/rails/inverse_of.yml
+++ b/.rubocop_todo/rails/inverse_of.yml
@@ -29,7 +29,6 @@ Rails/InverseOf:
     - 'app/models/clusters/project.rb'
     - 'app/models/commit_signatures/x509_commit_signature.rb'
     - 'app/models/commit_status.rb'
-    - 'app/models/concerns/analytics/cycle_analytics/stage.rb'
     - 'app/models/concerns/awardable.rb'
     - 'app/models/concerns/commit_signature.rb'
     - 'app/models/concerns/with_uploads.rb'
@@ -71,8 +70,6 @@ Rails/InverseOf:
     - 'app/models/work_item.rb'
     - 'app/models/x509_certificate.rb'
     - 'ee/app/models/allowed_email_domain.rb'
-    - 'ee/app/models/analytics/cycle_analytics/group_stage.rb'
-    - 'ee/app/models/analytics/cycle_analytics/group_value_stream.rb'
     - 'ee/app/models/analytics/devops_adoption/enabled_namespace.rb'
     - 'ee/app/models/analytics/devops_adoption/snapshot.rb'
     - 'ee/app/models/audit_events/external_audit_event_destination.rb'
diff --git a/.rubocop_todo/rails/pluck.yml b/.rubocop_todo/rails/pluck.yml
index 88b700d0190..307e6f59800 100644
--- a/.rubocop_todo/rails/pluck.yml
+++ b/.rubocop_todo/rails/pluck.yml
@@ -49,7 +49,6 @@ Rails/Pluck:
     - 'ee/spec/graphql/types/vulnerability_scanner_type_spec.rb'
     - 'ee/spec/helpers/ee/geo_helper_spec.rb'
     - 'ee/spec/helpers/ee/operations_helper_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_saver_spec.rb'
     - 'ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb'
     - 'ee/spec/lib/gitlab/custom_file_templates_spec.rb'
     - 'ee/spec/lib/gitlab/spdx/catalogue_spec.rb'
@@ -186,7 +185,6 @@ Rails/Pluck:
     - 'spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb'
     - 'spec/lib/gitlab/git/blame_spec.rb'
     - 'spec/lib/gitlab/git/conflict/parser_spec.rb'
-    - 'spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb'
     - 'spec/lib/gitlab/import_export/project/sample/relation_tree_restorer_spec.rb'
     - 'spec/lib/gitlab/import_export/project/tree_saver_spec.rb'
     - 'spec/lib/gitlab/language_detection_spec.rb'
@@ -285,7 +283,6 @@ Rails/Pluck:
     - 'spec/serializers/stage_entity_spec.rb'
     - 'spec/services/ci/compare_test_reports_service_spec.rb'
     - 'spec/services/ci/pipeline_processing/atomic_processing_service/status_collection_spec.rb'
-    - 'spec/services/clusters/applications/prometheus_config_service_spec.rb'
     - 'spec/services/issues/export_csv_service_spec.rb'
     - 'spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb'
     - 'spec/services/projects/participants_service_spec.rb'
diff --git a/.rubocop_todo/rails/redundant_foreign_key.yml b/.rubocop_todo/rails/redundant_foreign_key.yml
index 3251429876e..3a7c4a3754e 100644
--- a/.rubocop_todo/rails/redundant_foreign_key.yml
+++ b/.rubocop_todo/rails/redundant_foreign_key.yml
@@ -18,7 +18,6 @@ Rails/RedundantForeignKey:
     - 'app/models/clusters/concerns/application_core.rb'
     - 'app/models/clusters/integrations/prometheus.rb'
     - 'app/models/commit_signatures/x509_commit_signature.rb'
-    - 'app/models/concerns/analytics/cycle_analytics/stage.rb'
     - 'app/models/concerns/commit_signature.rb'
     - 'app/models/concerns/integrations/base_data_fields.rb'
     - 'app/models/group.rb'