Add latest changes from gitlab-org/gitlab@master

5 files changed, 0 insertions, 6 deletions

diff --git a/.rubocop_todo/gitlab/service_response.yml b/.rubocop_todo/gitlab/service_response.yml
index d6ce9633882..a61bb27ed2e 100644
--- a/.rubocop_todo/gitlab/service_response.yml
+++ b/.rubocop_todo/gitlab/service_response.yml
@@ -60,7 +60,6 @@ Gitlab/ServiceResponse:
     - 'ee/app/services/iterations/roll_over_issues_service.rb'
     - 'ee/app/services/iterations/update_service.rb'
     - 'ee/app/services/security/findings/dismiss_service.rb'
-    - 'ee/app/services/vulnerabilities/finding_dismiss_service.rb'
     - 'ee/app/services/vulnerability_issue_links/create_service.rb'
     - 'ee/app/services/vulnerability_issue_links/delete_service.rb'
     - 'ee/spec/graphql/mutations/security/finding/dismiss_spec.rb'
diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index dc1395a2da2..8c25697ea3a 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -871,7 +871,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/graphql/mutations/vulnerabilities/create_external_issue_link.rb'
     - 'ee/app/graphql/mutations/vulnerabilities/destroy_external_issue_link.rb'
     - 'ee/app/graphql/mutations/vulnerabilities/dismiss.rb'
-    - 'ee/app/graphql/mutations/vulnerabilities/finding/dismiss.rb'
     - 'ee/app/graphql/mutations/vulnerabilities/resolve.rb'
     - 'ee/app/graphql/mutations/vulnerabilities/revert_to_detected.rb'
     - 'ee/app/graphql/resolvers/alert_management/payload_alert_field_resolver.rb'
diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml
index 0321c4409c6..45f18e605b7 100644
--- a/.rubocop_todo/lint/unused_method_argument.yml
+++ b/.rubocop_todo/lint/unused_method_argument.yml
@@ -282,7 +282,6 @@ Lint/UnusedMethodArgument:
     - 'ee/app/services/group_saml/identity/destroy_service.rb'
     - 'ee/app/services/projects/update_mirror_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/process_scan_result_policy_service.rb'
-    - 'ee/app/services/vulnerabilities/finding_dismiss_service.rb'
     - 'ee/app/validators/vulnerabilities/cvss_vector_validator.rb'
     - 'ee/app/workers/automation/execute_rule_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/refresh_seats_worker.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 533c46719bb..9a3682ad1c8 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -3,9 +3,7 @@ RSpec/MissingFeatureCategory:
   Exclude:
     - 'ee/spec/components/billing/plan_component_spec.rb'
     - 'ee/spec/components/namespaces/storage/limit_alert_component_spec.rb'
-    - 'ee/spec/components/namespaces/storage/project_pre_enforcement_alert_component_spec.rb'
     - 'ee/spec/components/namespaces/storage/subgroup_pre_enforcement_alert_component_spec.rb'
-    - 'ee/spec/components/namespaces/storage/user_pre_enforcement_alert_component_spec.rb'
     - 'ee/spec/controllers/admin/application_settings_controller_spec.rb'
     - 'ee/spec/controllers/admin/clusters_controller_spec.rb'
     - 'ee/spec/controllers/autocomplete_controller_spec.rb'
diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml
index 5763faabc39..aa2b81c8cfc 100644
--- a/.rubocop_todo/style/format_string.yml
+++ b/.rubocop_todo/style/format_string.yml
@@ -215,7 +215,6 @@ Style/FormatString:
     - 'ee/app/services/timebox_report_service.rb'
     - 'ee/app/services/vulnerabilities/destroy_dismissal_feedback_service.rb'
     - 'ee/app/services/vulnerabilities/dismiss_service.rb'
-    - 'ee/app/services/vulnerabilities/finding_dismiss_service.rb'
     - 'ee/app/services/vulnerabilities/historical_statistics/adjustment_service.rb'
     - 'ee/app/services/vulnerabilities/statistics/adjustment_service.rb'
     - 'ee/app/services/vulnerability_external_issue_links/create_service.rb'