Add latest changes from gitlab-org/gitlab@master

4 files changed, 46 insertions, 4 deletions

diff --git a/.rubocop_todo/layout/hash_alignment.yml b/.rubocop_todo/layout/hash_alignment.yml
index b13a561958e..137f6cb7a05 100644
--- a/.rubocop_todo/layout/hash_alignment.yml
+++ b/.rubocop_todo/layout/hash_alignment.yml
@@ -386,7 +386,6 @@ Layout/HashAlignment:
     - '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'
-    - 'ee/spec/controllers/projects/security/network_policies_controller_spec.rb'
     - 'ee/spec/controllers/projects/settings/operations_controller_spec.rb'
     - 'ee/spec/controllers/trials_controller_spec.rb'
     - 'ee/spec/factories/dependencies.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index f80c3f20437..974883663ae 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1179,7 +1179,6 @@ Layout/LineLength:
     - 'ee/app/controllers/projects/licenses_controller.rb'
     - 'ee/app/controllers/projects/protected_environments_controller.rb'
     - 'ee/app/controllers/projects/requirements_management/requirements_controller.rb'
-    - 'ee/app/controllers/projects/security/network_policies_controller.rb'
     - 'ee/app/controllers/projects/security/policies_controller.rb'
     - 'ee/app/controllers/projects/security/vulnerabilities/notes_controller.rb'
     - 'ee/app/controllers/projects/threat_monitoring_controller.rb'
@@ -1904,7 +1903,6 @@ Layout/LineLength:
     - 'ee/spec/controllers/projects/push_rules_controller_spec.rb'
     - 'ee/spec/controllers/projects/runners_controller_spec.rb'
     - 'ee/spec/controllers/projects/security/configuration_controller_spec.rb'
-    - 'ee/spec/controllers/projects/security/network_policies_controller_spec.rb'
     - 'ee/spec/controllers/projects/security/vulnerabilities_controller_spec.rb'
     - 'ee/spec/controllers/projects/subscriptions_controller_spec.rb'
     - 'ee/spec/controllers/projects/threat_monitoring_controller_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 70fb8414f55..a2cca0b5b29 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -7,7 +7,6 @@ RSpec/VerifiedDoubles:
     - ee/spec/controllers/groups/sso_controller_spec.rb
     - ee/spec/controllers/oauth/geo_auth_controller_spec.rb
     - ee/spec/controllers/projects/clusters_controller_spec.rb
-    - ee/spec/controllers/projects/security/network_policies_controller_spec.rb
     - ee/spec/db/production/license_spec.rb
     - ee/spec/elastic/migrate/20210510113500_delete_merge_requests_from_original_index_spec.rb
     - ee/spec/elastic/migrate/20210510143200_delete_notes_from_original_index_spec.rb
diff --git a/.rubocop_todo/style/next.yml b/.rubocop_todo/style/next.yml
new file mode 100644
index 00000000000..e1f9b927db6
--- /dev/null
+++ b/.rubocop_todo/style/next.yml
@@ -0,0 +1,46 @@
+---
+# Cop supports --auto-correct.
+Style/Next:
+  # Offense count: 41
+  # Temporarily disabled due to too many offenses
+  Enabled: false
+  Exclude:
+    - 'app/finders/projects/serverless/functions_finder.rb'
+    - 'app/models/preloaders/environments/deployment_preloader.rb'
+    - 'app/models/route.rb'
+    - 'app/services/authorized_project_update/find_records_due_for_refresh_service.rb'
+    - 'app/validators/nested_attributes_duplicates_validator.rb'
+    - 'config/initializers/01_secret_token.rb'
+    - 'config/initializers/sidekiq_cluster.rb'
+    - 'ee/app/controllers/groups/analytics/cycle_analytics/value_streams_controller.rb'
+    - 'ee/app/services/app_sec/dast/profiles/create_associations_service.rb'
+    - 'ee/app/services/elastic/cluster_reindexing_service.rb'
+    - 'ee/app/services/gitlab_subscriptions/fetch_purchase_eligible_namespaces_service.rb'
+    - 'ee/app/services/security/auto_fix_service.rb'
+    - 'ee/db/fixtures/development/20_vulnerabilities.rb'
+    - 'ee/lib/ee/audit/protected_branches_changes_auditor.rb'
+    - 'ee/lib/gitlab/elastic/search_results.rb'
+    - 'ee/lib/system_check/geo/authorized_keys_check.rb'
+    - 'lib/backup/manager.rb'
+    - 'lib/banzai/filter/external_link_filter.rb'
+    - 'lib/banzai/filter/footnote_filter.rb'
+    - 'lib/banzai/filter/kroki_filter.rb'
+    - 'lib/banzai/filter/math_filter.rb'
+    - 'lib/banzai/filter/plantuml_filter.rb'
+    - 'lib/banzai/filter/table_of_contents_filter.rb'
+    - 'lib/gitlab/background_migration/encrypt_static_object_token.rb'
+    - 'lib/gitlab/database.rb'
+    - 'lib/gitlab/fogbugz_import/importer.rb'
+    - 'lib/gitlab/gitaly_client/repository_service.rb'
+    - 'lib/gitlab/import_export/attributes_permitter.rb'
+    - 'lib/gitlab/import_export/base/relation_object_saver.rb'
+    - 'lib/gitlab/metrics/samplers/base_sampler.rb'
+    - 'lib/gitlab/pagination/keyset/in_operator_optimization/strategies/record_loader_strategy.rb'
+    - 'lib/gitlab/reference_extractor.rb'
+    - 'lib/gitlab/tree_summary.rb'
+    - 'lib/tasks/gitlab/assets.rake'
+    - 'lib/tasks/gitlab/db/validate_config.rake'
+    - 'rubocop/cop/static_translation_definition.rb'
+    - 'scripts/perf/query_limiting_report.rb'
+    - 'spec/lib/gitlab/import_export/import_test_coverage_spec.rb'
+    - 'spec/presenters/packages/npm/package_presenter_spec.rb'