Add latest changes from gitlab-org/gitlab@master

5 files changed, 0 insertions, 7 deletions

diff --git a/.rubocop_todo/layout/hash_alignment.yml b/.rubocop_todo/layout/hash_alignment.yml
index aafacd5f265..b13a561958e 100644
--- a/.rubocop_todo/layout/hash_alignment.yml
+++ b/.rubocop_todo/layout/hash_alignment.yml
@@ -383,7 +383,6 @@ Layout/HashAlignment:
     - 'ee/lib/gitlab/elastic/helper.rb'
     - 'ee/lib/gitlab/elastic/indexer.rb'
     - 'ee/lib/gitlab/geo/replication/base_transfer.rb'
-    - 'ee/lib/gitlab/prometheus/queries/packet_flow_query.rb'
     - 'ee/spec/controllers/ee/projects/variables_controller_spec.rb'
     - 'ee/spec/controllers/groups/epic_boards_controller_spec.rb'
     - 'ee/spec/controllers/groups/issues_controller_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index d46c7a6da62..f80c3f20437 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -4424,7 +4424,6 @@ Layout/LineLength:
     - 'spec/features/projects/files/user_browses_files_spec.rb'
     - 'spec/features/projects/files/user_edits_files_spec.rb'
     - 'spec/features/projects/infrastructure_registry_spec.rb'
-    - 'spec/features/projects/integrations/prometheus_external_alerts_spec.rb'
     - 'spec/features/projects/integrations/user_activates_issue_tracker_spec.rb'
     - 'spec/features/projects/integrations/user_activates_jira_spec.rb'
     - 'spec/features/projects/integrations/user_uses_inherited_settings_spec.rb'
diff --git a/.rubocop_todo/rails/time_zone.yml b/.rubocop_todo/rails/time_zone.yml
index 86d0632ac47..ff97dfeb444 100644
--- a/.rubocop_todo/rails/time_zone.yml
+++ b/.rubocop_todo/rails/time_zone.yml
@@ -13,7 +13,6 @@ Rails/TimeZone:
   - ee/lib/gitlab/geo/log_cursor/logger.rb
   - ee/lib/gitlab/geo/oauth/login_state.rb
   - ee/lib/gitlab/prometheus/queries/cluster_query.rb
-  - ee/lib/gitlab/prometheus/queries/packet_flow_query.rb
   - ee/spec/lib/ee/gitlab/checks/push_rules/commit_check_spec.rb
   - ee/spec/lib/ee/gitlab/ci/pipeline/quota/job_activity_spec.rb
   - ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb
@@ -44,7 +43,6 @@ Rails/TimeZone:
   - ee/spec/lib/gitlab/git_access_spec.rb
   - ee/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
   - ee/spec/lib/gitlab/prometheus/queries/cluster_query_spec.rb
-  - ee/spec/lib/gitlab/prometheus/queries/packet_flow_query_spec.rb
   - lib/api/helpers.rb
   - lib/api/sidekiq_metrics.rb
   - lib/backup/manager.rb
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index e272fbc555c..70fb8414f55 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -90,8 +90,6 @@ RSpec/VerifiedDoubles:
     - ee/spec/lib/gitlab/middleware/ip_restrictor_spec.rb
     - ee/spec/lib/gitlab/patch/legacy_database_config_spec.rb
     - ee/spec/lib/gitlab/prometheus/queries/cluster_query_spec.rb
-    - ee/spec/lib/gitlab/prometheus/queries/packet_flow_metrics_query_spec.rb
-    - ee/spec/lib/gitlab/prometheus/queries/packet_flow_query_spec.rb
     - ee/spec/lib/gitlab/subscription_portal/clients/rest_spec.rb
     - ee/spec/lib/sidebars/groups/menus/analytics_menu_spec.rb
     - ee/spec/lib/system_check/app/elasticsearch_check_spec.rb
diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml
index 4673f0d71d2..bf50c4c1922 100644
--- a/.rubocop_todo/style/percent_literal_delimiters.yml
+++ b/.rubocop_todo/style/percent_literal_delimiters.yml
@@ -324,7 +324,6 @@ Style/PercentLiteralDelimiters:
     - 'ee/lib/gitlab/ci/parsers/security/formatters/dast.rb'
     - 'ee/lib/gitlab/geo.rb'
     - 'ee/lib/gitlab/geo/replicator.rb'
-    - 'ee/lib/gitlab/prometheus/queries/packet_flow_query.rb'
     - 'ee/lib/gitlab/usage/metrics/instrumentations/license_metric.rb'
     - 'ee/lib/tasks/gitlab/elastic/test.rake'
     - 'ee/spec/config/metrics/every_metric_definition_spec.rb'